RPM: merge redhat directory with master branch

1 files changed, 15 insertions, 14 deletions

diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index c02b79769..27e23795e 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libcarddav (version R14.0.0)
+# spec file for package libcarddav (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,12 +12,14 @@
 # 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
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libcarddav
 %define tde_prefix /opt/trinity
 %define tde_includedir %{tde_prefix}/include
@@ -33,7 +35,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	0.6.2
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	A portable CardDAV client implementation
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
@@ -52,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}}
 
@@ -151,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
@@ -191,6 +194,4 @@ fi
 %__rm -rf %{buildroot}
 
 
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.2-1
-- Initial release for TDE R14.0.0
+%changelog