Mageia 2: add support for MGA2 build in redhat packages

1 files changed, 33 insertions, 12 deletions

diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index c47f40a49..c3ed99db0 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -3,9 +3,12 @@
 %define _variant .opt
 %endif
 
-Name:		libcarddav
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+Name:		trinity-libcarddav
 Version:	0.6.2
-Release:	2debian2.1%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -22,8 +25,16 @@ Source0:	libcarddav_0.6.2-2debian2.tar.gz
 %if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:	libcurl-devel
 %else
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}curl-devel
+%else
+# Specific CURL version for TDE on RHEL 5 (and older)
 BuildRequires:	trinity-libcurl-devel
 %endif
+%endif
+
+Obsoletes:	libcarddav < %{version}-%{release}
+Provides:	libcarddav = %{version}-%{release}
 
 %description
 Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
@@ -35,16 +46,22 @@ Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name}
 
+Obsoletes:	libcarddav-devel < %{version}-%{release}
+Provides:	libcarddav-devel = %{version}-%{release}
+
 %description devel
 %{summary}
 
 
 %prep
-%setup -q
+%setup -q -n libcarddav-%{version}
 
 %build
 autoreconf --force --install --symlink
-%configure
+%configure \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  
 %__make %{?_smp_mflags}
 
 %install
@@ -52,24 +69,28 @@ autoreconf --force --install --symlink
 %__make install DESTDIR=%{buildroot}
 
 # The include files do not go in the correct directory
-%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.1/*.h %{buildroot}%{_includedir}
-%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.1
+%__mv -f %{buildroot}%{tde_includedir}/libcarddav-0.6.1/*.h %{buildroot}%{tde_includedir}
+%__rm -rf %{buildroot}%{tde_includedir}/libcarddav-0.6.1
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/*.so.*
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}/*.h
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{tde_includedir}/*.h
+%{tde_libdir}/*.a
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/pkgconfig/libcarddav.pc
 
 
 %Changelog
+* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
+- Renames to 'trinity-libcaldav'
+- Build on MGA2
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
 - Initial build for RHEL 6, RHEL 5, and Fedora 15