From fb2716d8f9ad1ace3e0d9f4f561557a40be0bb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 7 Nov 2014 22:37:30 +0100 Subject: RPM packaging: update libcaldav --- .../libcaldav-0.6.2-fix_installation.patch | 24 --- .../dependencies/libcaldav/libcaldav-14.0.0.spec | 2 +- .../dependencies/libcaldav/libcaldav-3.5.13.2.spec | 192 ++++++++++++++------- 3 files changed, 127 insertions(+), 91 deletions(-) delete mode 100644 redhat/dependencies/libcaldav/libcaldav-0.6.2-fix_installation.patch (limited to 'redhat/dependencies/libcaldav') diff --git a/redhat/dependencies/libcaldav/libcaldav-0.6.2-fix_installation.patch b/redhat/dependencies/libcaldav/libcaldav-0.6.2-fix_installation.patch deleted file mode 100644 index e1eb18ebf..000000000 --- a/redhat/dependencies/libcaldav/libcaldav-0.6.2-fix_installation.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- libcaldav-0.6.5/libcaldav.pc.in.ORI 2012-08-02 23:25:37.149283733 +0200 -+++ libcaldav-0.6.5/libcaldav.pc.in 2012-08-02 23:25:45.356339277 +0200 -@@ -3,8 +3,8 @@ - libdir=@libdir@ - includedir=@includedir@ - --pkglibdir=${libdir}/@PACKAGE@ --pkgincludedir=${includedir}/@PACKAGE@ -+pkglibdir=${libdir} -+pkgincludedir=${includedir} - - Name: libcaldav - Description: libcaldav is a client library for CalDAV ---- libcaldav-0.6.5/src/Makefile.am.ORI 2012-08-02 23:33:27.804972833 +0200 -+++ libcaldav-0.6.5/src/Makefile.am 2012-08-02 23:33:35.460457142 +0200 -@@ -37,7 +37,7 @@ - get-freebusy-report.c \ - get-freebusy-report.h - --libcaldav_includedir=$(includedir)/libcaldav-@VERSION@ -+libcaldav_includedir=$(includedir) - libcaldav_include_HEADERS = caldav.h - - noinst_HEADERS = \ diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index ddb105982..386e92fbc 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libcaldav (version 0.6.5) +# spec file for package libcaldav (version R14.0.0) # # Copyright (c) 2014 Trinity Desktop Environment # diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec index 9bd814c2a..4ff94304e 100644 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec @@ -1,82 +1,157 @@ -# 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 libcaldav (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_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc +%define tde_pkg libcaldav +%define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} -Name: trinity-libcaldav -Version: 0.6.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define libcaldav %{_lib}caldav +%else +%define libcaldav libcaldav +%endif + -Vendor: Trinity Project +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.6.5 +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Summary: A client library that adds support for the CalDAV protocol (rfc4791) +Group: System/Libraries URL: http://www.trinitydesktop.org/ -Packager: Francois Andriot -License: GPL -Group: System Environment/Libraries -Summary: A client library that adds support for the CalDAV protocol (rfc4791). +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot -Prefix: %{tde_prefix} +Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: libcaldav_0.6.5-2debian2.tar.gz -# [libcaldav] Fix messy installation directories -Patch1: libcaldav-0.6.2-fix_installation.patch - +BuildRequires: make BuildRequires: libtool +BuildRequires: fdupes + +# GTK2 support %if 0%{?rhel} == 4 BuildRequires: evolution28-gtk2-devel %else BuildRequires: glib2-devel BuildRequires: gtk2-devel %endif -BuildRequires: make - -Obsoletes: libcaldav < %{version}-%{release} -Provides: libcaldav = %{version}-%{release} +# 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}} %description libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). The object is to have a library which fully implements the protocol so that it is easy to integrate CalDAV support into any PIM application. -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +########## + +%package -n %{libcaldav}0 +Summary: A client library that adds support for the CalDAV protocol (rfc4791) +Group: System/Libraries + +Obsoletes: trinity-libcaldav < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libcaldav = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libcaldav = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libcaldav}0 +libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). +The object is to have a library which fully implements the protocol so that it is +easy to integrate CalDAV support into any PIM application. + +%files -n %{libcaldav}0 +%defattr(-,root,root,-) +%{_libdir}/libcaldav.so.0 +%{_libdir}/libcaldav.so.0.0.6 +%{_docdir}/libcaldav-%{version}/ + +%post -n %{libcaldav}0 +/sbin/ldconfig + +%postun -n %{libcaldav}0 +/sbin/ldconfig + +########## + +%package -n %{libcaldav}-devel +Summary: A client library that adds support for the CalDAV protocol (Development Files) +Group: Development/Libraries/Other +Requires: %{libcaldav}0 = %{?epoch:%{epoch}:}%{version}-%{release} +%{?libcurl_devel:Requires: %{libcurl_devel}} +Requires: glib2-devel + +Obsoletes: trinity-libcaldav-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libcaldav}-devel +libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). +The object is to have a library which fully implements the protocol so that it is +easy to integrate CalDAV support into any PIM application. -Obsoletes: libcaldav-devel < %{version}-%{release} -Provides: libcaldav-devel = %{version}-%{release} +This package includes the development files. -%description devel -%{summary} +%files -n %{libcaldav}-devel +%defattr(-,root,root,-) +%{_includedir}/libcaldav/ +%{_libdir}/libcaldav.la +%{_libdir}/libcaldav.so +%{_libdir}/pkgconfig/libcaldav.pc + +%post -n %{libcaldav}-devel +/sbin/ldconfig -%if 0%{?suse_version} || 0%{?pclinuxos} +%postun -n %{libcaldav}-devel +/sbin/ldconfig + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n libcaldav-%{version} -%patch1 -p1 -b .dir autoreconf --force --install --symlink @@ -85,14 +160,15 @@ autoreconf --force --install --symlink export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +# RHEL4 stuff if [ -d /usr/evolution28 ]; then export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" fi %configure \ - --docdir=%{tde_docdir}/libcaldav \ - --includedir=%{tde_includedir} \ - --libdir=%{tde_libdir} \ + --docdir=%{_docdir}/libcaldav \ + --includedir=%{_includedir} \ + --libdir=%{_libdir} \ \ --disable-dependency-tracking @@ -103,37 +179,21 @@ fi %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# Unwanted files -%__rm -f %{buildroot}%{tde_libdir}/*.a +# Unwanted files +%__rm -f %{buildroot}%{_libdir}/*.a +# Fix doc dir +mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/ -%clean -%__rm -rf %{buildroot} - +# Fix include dir +mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/libcaldav/ -%files -%defattr(-,root,root,-) -%{tde_libdir}/libcaldav.so.* -%{tde_docdir}/libcaldav/ +# Fix duplicate files +%fdupes %{?buildroot} -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/caldav.h -%{tde_libdir}/libcaldav.la -%{tde_libdir}/libcaldav.so -%{tde_libdir}/pkgconfig/libcaldav.pc -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig +%clean +%__rm -rf %{buildroot} %Changelog -- cgit v1.2.1