From e74a55645fa75299a8bdfe8ce7c5e64e93500846 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:15:59 +0200 Subject: Fix description --- redhat/dependencies/libcarddav/libcarddav.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'redhat/dependencies/libcarddav/libcarddav.spec') diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index 9ab0dbd9f..cc01ccc69 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -8,7 +8,7 @@ Packager: Francois Andriot License: GPL Group: System Environment/Libraries -Summary: A client library that adds support for the CalDAV protocol (rfc4791). +Summary: Libcarddav is a portable CardDAV client implementation. Source0: libcarddav_0.6.2-2debian2.tar.gz -- cgit v1.2.1 From 703986bfe4270bb901f594b92eebb265d04ad8f5 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 23:32:41 +0200 Subject: Lot of updates for TDE 3.5.13 (RHEL 5, RHEL 6, Fedora 15) --- redhat/dependencies/libcarddav/libcarddav.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'redhat/dependencies/libcarddav/libcarddav.spec') diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index cc01ccc69..ed1ce2a70 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -8,10 +8,18 @@ Packager: Francois Andriot License: GPL Group: System Environment/Libraries -Summary: Libcarddav is a portable CardDAV client implementation. +Summary: A portable CardDAV client implementation originally developed for the Trinity PIM suite. + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: libcarddav_0.6.2-2debian2.tar.gz +%if 0%{?fedora} || 0%{?rhel} >= 6 +BuildRequires: libcurl-devel +%else +BuildRequires: trinity-libcurl-devel +%endif + %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. @@ -38,6 +46,10 @@ autoreconf --force --install --symlink %__rm -rf %{buildroot} %__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 + %clean %__rm -rf %{buildroot} @@ -46,7 +58,7 @@ autoreconf --force --install --symlink %{_libdir}/*.so.* %files devel -%{_includedir}/%{name}-0.6.1 +%{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so -- cgit v1.2.1 From 0061571b57d37f17c074ba869a674fb774fb49b4 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 18:36:20 +0100 Subject: TDE 3.5.13 stable release for RHEL/Fedora --- redhat/dependencies/libcarddav/libcarddav.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'redhat/dependencies/libcarddav/libcarddav.spec') diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index ed1ce2a70..a2e8c7310 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -1,6 +1,6 @@ Name: libcarddav Version: 0.6.2 -Release: 2debian2%{?dist} +Release: 2debian2.1%{?dist} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ @@ -66,5 +66,5 @@ autoreconf --force --install --symlink %Changelog -* Fri Oct 21 2011 Francois Andriot - 0.6.5-2debian2 -- Initial build for RHEL 6.0 +* Sun Oct 30 2011 Francois Andriot - 0.6.5-2debian2 .1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 -- cgit v1.2.1 From 8695886e97b271cba9f587a94d5ee8368a11a6db Mon Sep 17 00:00:00 2001 From: albator Date: Mon, 31 Oct 2011 19:18:15 +0100 Subject: TDE 3.5.13 final more small fixes before release (RHEL/Fedora) --- redhat/dependencies/libcarddav/libcarddav.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'redhat/dependencies/libcarddav/libcarddav.spec') diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index a2e8c7310..c47f40a49 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -1,6 +1,11 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%endif + Name: libcarddav Version: 0.6.2 -Release: 2debian2.1%{?dist} +Release: 2debian2.1%{?dist}%{?_variant} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ -- cgit v1.2.1