diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-03 13:01:47 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-03 13:01:47 +0200 |
| commit | 5b9c5354a7a6d4dec713c4d5e8ca5da912cd980b (patch) | |
| tree | 67565e277aee6f7e08527453d026d865ba64d5ad /redhat/dependencies/libcarddav | |
| parent | 5427075cae2f0741c0d74a39e56737b968baf699 (diff) | |
| download | tde-packaging-5b9c5354a7a6d4dec713c4d5e8ca5da912cd980b.tar.gz tde-packaging-5b9c5354a7a6d4dec713c4d5e8ca5da912cd980b.zip | |
RPM Packaging: update dependencies
Diffstat (limited to 'redhat/dependencies/libcarddav')
| -rw-r--r-- | redhat/dependencies/libcarddav/libcarddav-14.0.0.spec | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec index 42ba6579e..6e4c9e329 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec @@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - +# CURL support %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} BuildRequires: libcurl-devel %else @@ -76,20 +76,22 @@ Provides: libcarddav-devel = %{version}-%{release} %build # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}" +export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +# RHEL4 stuff if [ -d /usr/evolution28 ]; then export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" fi -#autoreconf --force --install --symlink - %configure \ --includedir=%{tde_includedir} \ --libdir=%{tde_libdir} \ - -%__make %{?_smp_mflags} LIBTOOL=$(which libtool) + \ + --disable-dependency-tracking + +%__make %{?_smp_mflags} + %install %__rm -rf %{buildroot} @@ -97,6 +99,7 @@ fi %__rm -f %{buildroot}%{tde_libdir}/libcarddav.a + %clean %__rm -rf %{buildroot} @@ -126,9 +129,12 @@ fi %Changelog -* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3 -- Renames to 'trinity-libcaldav' +* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.3-4 +- Initial release for TDE R14.0.0 + +* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3 +- Renames to 'trinity-libcarddav' - Build on MGA2 -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2 - Initial release for RHEL 6, RHEL 5, and Fedora 15 |