RPM packaging: update libcarddav

3 files changed, 120 insertions, 87 deletions

diff --git a/redhat/dependencies/libcarddav/libcarddav-0.6.5-fix_installation.patch b/redhat/dependencies/libcarddav/libcarddav-0.6.5-fix_installation.patch
deleted file mode 100644
index 12990f87a..000000000
--- a/redhat/dependencies/libcarddav/libcarddav-0.6.5-fix_installation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libcarddav-0.6.2/libcarddav.pc.in.ORI	2012-08-02 23:38:03.688776626 +0200
-+++ libcarddav-0.6.2/libcarddav.pc.in	2012-08-02 23:38:09.055630966 +0200
-@@ -3,8 +3,8 @@
- libdir=@libdir@
- includedir=@includedir@
- 
--pkglibdir=${libdir}/@PACKAGE@
--pkgincludedir=${includedir}/@PACKAGE@
-+pkglibdir=${libdir}
-+pkgincludedir=${includedir}
- 
- Name: libcarddav
- Description: libcarddav is a client library for CardDAV
---- libcarddav-0.6.2/src/Makefile.am.ORI	2012-08-02 23:39:20.990884825 +0200
-+++ libcarddav-0.6.2/src/Makefile.am	2012-08-02 23:39:36.182559576 +0200
-@@ -35,7 +35,7 @@
- 			lock-carddav-object.c \
- 			lock-carddav-object.h
- 
--libcarddav_includedir=$(includedir)/libcarddav-@VERSION@
-+libcarddav_includedir=$(includedir)
- libcarddav_include_HEADERS = carddav.h
- 
- noinst_HEADERS = \
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index abd7743d6..c02b79769 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 0.6.2)
+# spec file for package libcarddav (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
index 0ee74644a..d09b0fed7 100644
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
@@ -1,84 +1,162 @@
-# 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 3.5.13-SRU)
+#
+# 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 1
 %define tde_version 3.5.13.2
-
+%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:4}%{?preversion:3_%{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:5}%{?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:	libcarddav_0.6.2-2debian2.tar.gz
 
-# [libcarddav] Fix messy installation directories
-Patch1:		libcarddav-0.6.5-fix_installation.patch
+BuildRequires:	make
+BuildRequires:	libtool
 
 # CURL support
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	libcurl-devel
+%define libcurl_devel libcurl-devel
 %else
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}curl-devel
+%define libcurl_devel %{_lib}curl-devel
 %else
 # Specific CURL version for TDE on RHEL 5 (and older)
-BuildRequires:	trinity-libcurl-devel
+#define libcurl_devel trinity-libcurl-devel
 %endif
 %endif
+%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
+# 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
+
+
+##########
 
-Obsoletes:	libcarddav-devel < %{version}-%{release}
-Provides:	libcarddav-devel = %{version}-%{release}
+%package -n %{libcarddav}-devel
+Summary:	A portable CardDAV client implementation (Development Files)
+Group:		Development/Libraries/Other
+Requires:	%{libcarddav}0 = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?libcurl_devel:Requires: %{libcurl_devel}}
+Requires:	glib2-devel
 
-%description devel
-%{summary}
+Obsoletes:	trinity-libcarddav-devel < %{version}-%{release}
+Provides:	trinity-libcarddav-devel = %{version}-%{release}
+Provides:	libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%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
+
+%post -n %{libcarddav}-devel
+/sbin/ldconfig
+
+%postun -n %{libcarddav}-devel
+/sbin/ldconfig
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n libcarddav-%{version}
-%patch1 -p1 -b .dir
 autoreconf --force --install --symlink
 
 
 %build
+unset QTDIR QTINC QTLIB
+
 # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
 export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@@ -89,8 +167,8 @@ if [ -d /usr/evolution28 ]; then
 fi
 
 %configure \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
+  --includedir=%{_includedir} \
+  --libdir=%{_libdir} \
   \
   --disable-dependency-tracking
 
@@ -106,38 +184,17 @@ fi
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool
 
-# Unwanted files
-%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
+# Unwanted files
+%__rm -f %{buildroot}%{_libdir}/libcarddav.a
+
+# Fix include location
+%__mv -f "%{?buildroot}%{_includedir}/libcarddav-0.6.1" "%{?buildroot}%{_includedir}/libcarddav"
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libcarddav.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/carddav.h
-%{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 Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4
 - Build for Fedora 19