Mageia 2: add support for MGA2 build in redhat packages

1 files changed, 36 insertions, 14 deletions

diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index eef45ba22..f75aa3119 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -3,9 +3,14 @@
 %define _variant .opt
 %endif
 
-Name:		libcaldav
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+Name:		trinity-libcaldav
 Version:	0.6.5
-Release:	2debian2.2%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -24,12 +29,19 @@ BuildRequires:	glib2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	make
 
+Obsoletes:	libcaldav < %{version}-%{release}
+Provides:	libcaldav = %{version}-%{release}
+
 %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
 
 %description
 libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
@@ -39,18 +51,24 @@ easy to integrate CalDAV support into any PIM application.
 %package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name}
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	libcaldav-devel < %{version}-%{release}
+Provides:	libcaldav-devel = %{version}-%{release}
 
 %description devel
 %{summary}
 
 
 %prep
-%setup -q
+%setup -q -n libcaldav-%{version}
 
 %build
 autoreconf --force --install --symlink
-%configure
+%configure \
+  --docdir=%{tde_docdir}/libcaldav \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  
 %__make %{?_smp_mflags}
 
 %install
@@ -58,26 +76,30 @@ 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.2/*.h %{buildroot}%{_includedir}
-%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.2
+%__mv -f %{buildroot}%{tde_includedir}/libcaldav-0.6.2/*.h %{buildroot}%{tde_includedir}
+%__rm -rf %{buildroot}%{tde_includedir}/libcaldav-0.6.2
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/*.so.*
-%{_datadir}/doc/%{name}
+%{tde_libdir}/*.so.*
+%{tde_docdir}/libcaldav
 
 %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/libcaldav.pc
 
 
 %Changelog
+* Sun 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