2 files changed, 111 insertions, 58 deletions
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
index 0513be51d..fab0b738d 100644
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -31,7 +31,7 @@
 
 
 Name:		trinity-%{tde_pkg}
-Epoch:		2
+Epoch:		%{tde_epoch}
 Version:	0.6.5
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	A client library that adds support for the CalDAV protocol (rfc4791)
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index 40d457fb1..463719254 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -1,30 +1,59 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package libcarddav (version 0.6.2)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
+%define tde_pkg libcarddav
+%define tde_prefix /opt/trinity
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
-Name:		trinity-libcarddav
-Version:	0.6.2
-Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libcarddav %{_lib}carddav
+%else
+%define libcarddav libcarddav
+%endif
+
 
-Vendor:		Trinity Project
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.6.2
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	A portable CardDAV client implementation
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
 
-License:	GPL
-Group:		System Environment/Libraries
-Summary:	A portable CardDAV client implementation originally developed for the Trinity PIM suite.
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Deskio
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	make
+
 # CURL support
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
 BuildRequires:	libcurl-devel
@@ -37,37 +66,84 @@ BuildRequires:	trinity-libcurl-devel
 %endif
 %endif
 
+# GTK2 support
 %if 0%{?rhel} == 4
 BuildRequires:	evolution28-gtk2-devel
 %else
 BuildRequires:	glib2-devel
 BuildRequires:	gtk2-devel
 %endif
-BuildRequires:	make
-
-Obsoletes:	libcarddav < %{version}-%{release}
-Provides:	libcarddav = %{version}-%{release}
 
 %description
 Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
 It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
 Build dependencies are minimal, requiring only libcurl.
 
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+##########
+
+%package -n %{libcarddav}0
+Summary:	A portable CardDAV client implementation
+Group:		System/Libraries
+
+Obsoletes:	trinity-libcarddav < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libcarddav = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libcarddav = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n %{libcarddav}0
+Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
+It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
+Build dependencies are minimal, requiring only libcurl.
+
+%files -n %{libcarddav}0
+%defattr(-,root,root,-)
+%{_libdir}/libcarddav.so.0
+%{_libdir}/libcarddav.so.0.0.6
+
+%post -n %{libcarddav}0
+/sbin/ldconfig
+
+%postun -n %{libcarddav}0
+/sbin/ldconfig
+
+
+##########
+
+%package -n %{libcarddav}-devel
+Summary:	A portable CardDAV client implementation (Development Files)
+Group:		Development/Libraries/C and C++
+Requires:	%{libcarddav} = %{version}-%{release}
+
+Obsoletes:	trinity-libcarddav-devel < %{version}-%{release}
+Provides:	trinity-libcarddav-devel = %{version}-%{release}
+Provides:	%{libcarddav} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n %{libcarddav}-devel
+Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
+It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
+Build dependencies are minimal, requiring only libcurl.
+
+This package contains the development files.
+
+%files -n %{libcarddav}-devel
+%defattr(-,root,root,-)
+%{_includedir}/libcarddav/
+%{_libdir}/libcarddav.la
+%{_libdir}/libcarddav.so
+%{_libdir}/pkgconfig/libcarddav.pc
 
-Obsoletes:	libcarddav-devel < %{version}-%{release}
-Provides:	libcarddav-devel = %{version}-%{release}
+%post -n %{libcarddav}-devel
+/sbin/ldconfig
+
+%postun -n %{libcarddav}-devel
+/sbin/ldconfig
 
-%description devel
-%{summary}
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -89,8 +165,8 @@ if [ -d /usr/evolution28 ]; then
 fi
 
 %configure \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
+  --includedir=%{_includedir} \
+  --libdir=%{_libdir} \
   \
   --disable-dependency-tracking
 
@@ -99,39 +175,16 @@ fi
 
 %install
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
+%__make install DESTDIR=%{buildroot}
 
-%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
+# Unwanted files
+%__rm -f %{buildroot}%{_libdir}/libcarddav.a
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libcarddav.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/libcarddav/
-%{tde_libdir}/libcarddav.la
-%{tde_libdir}/libcarddav.so
-%{tde_libdir}/pkgconfig/libcarddav.pc
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-
 %Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.2-1
 - Initial release for TDE R14.0.0