summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec')
-rw-r--r--redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec26
1 files changed, 5 insertions, 21 deletions
diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
index 4ff94304e..419ff8ff9 100644
--- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
@@ -33,7 +33,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.6.5
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
Summary: A client library that adds support for the CalDAV protocol (rfc4791)
Group: System/Libraries
URL: http://www.trinitydesktop.org/
@@ -65,15 +65,11 @@ BuildRequires: gtk2-devel
%endif
# 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}}
@@ -196,16 +192,4 @@ mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/l
%__rm -rf %{buildroot}
-%Changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-4
-- Build for Fedora 19
-
-* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
-- Renames to 'trinity-libcaldav'
-- Build on MGA2
-
-* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2
-- Add missing BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1
-- Initial release for RHEL 6, RHEL 5, and Fedora 15
+%changelog