summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies/libcarddav/libcarddav-14.0.0.spec')
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-14.0.0.spec17
1 files changed, 9 insertions, 8 deletions
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index 7faa4cf44..2e99ae603 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -54,19 +54,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: libcarddav-14.0.1-rhel5.patch
+
BuildRequires: make
BuildRequires: libtool
# CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define libcurl_devel libcurl-devel
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel %{_lib}curl-devel
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define libcurl_devel libcurl-devel >= 7.15.5
%else
# Specific CURL version for TDE on RHEL 5 (and older)
-#define libcurl_devel trinity-libcurl-devel
-%endif
+%define libcurl_devel curl-devel >= 7.15.5
%endif
%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
@@ -153,11 +151,14 @@ This package contains the development files.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?rhel} == 5
+%patch1 -p1 -b .ftbfs
+%endif
# Fix empty ChangeLog cause invalid macro in 'configure.ac'
echo "%{name} (%{version})" >ChangeLog
-./autogen.sh
+autoreconf -fiv
%build