diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-08-05 20:25:18 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-08-05 20:25:18 +0200 |
| commit | 562049cd694f6dd0927b9880227fc4f6da008839 (patch) | |
| tree | e939e442f1fb29ff29811ebc02f672ecf62a47c1 /redhat/dependencies/libcaldav/libcaldav-14.0.0.spec | |
| parent | 6253ed4f8177cb33fef709fb7e215ff94e6300c1 (diff) | |
| download | tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.tar.gz tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.zip | |
RPM Packaging: massive update
Diffstat (limited to 'redhat/dependencies/libcaldav/libcaldav-14.0.0.spec')
| -rw-r--r-- | redhat/dependencies/libcaldav/libcaldav-14.0.0.spec | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 9a6a9a6ff..3c060415d 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -54,6 +54,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch1: libcaldav-14.0.1-rhel5.patch + BuildRequires: make BuildRequires: libtool BuildRequires: fdupes @@ -67,15 +69,10 @@ BuildRequires: gtk2-devel %endif # 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}} @@ -154,7 +151,10 @@ This package includes the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -./autogen.sh +%if 0%{?rhel} == 5 +%patch1 -p1 -b .ftbfs +%endif +autoreconf -fiv %build |