summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-04-09 10:50:39 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-04-09 10:50:39 +0200
commit28ee26436c2d314e2f6d16defd705a78f6fcd17c (patch)
tree3ea1172b1f51fc8b05923353f58944dec622f40b /redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
parentbbf51c9c3453eaeb9192af27aa797edffe66ff80 (diff)
downloadtde-packaging-28ee26436c2d314e2f6d16defd705a78f6fcd17c.tar.gz
tde-packaging-28ee26436c2d314e2f6d16defd705a78f6fcd17c.zip
RPM Packaging: updates for 3.5.13.2 packages build on OBS
Diffstat (limited to 'redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec')
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec9
1 files changed, 3 insertions, 6 deletions
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
index d09b0fed7..e83dfa9eb 100644
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
@@ -56,15 +56,11 @@ BuildRequires: make
BuildRequires: libtool
# CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define libcurl_devel libcurl-devel
%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel %{_lib}curl-devel
-%else
# Specific CURL version for TDE on RHEL 5 (and older)
-#define libcurl_devel trinity-libcurl-devel
-%endif
+%define libcurl_devel trinity-libcurl-devel
%endif
%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
@@ -151,6 +147,7 @@ This package contains the development files.
%prep
%setup -q -n libcarddav-%{version}
+%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/"
autoreconf --force --install --symlink