diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-04 12:48:59 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-04 12:48:59 -0500 |
| commit | 169853a068683db6540e3b77542d5139bb7867d1 (patch) | |
| tree | 2163209e7dc0569f9b0f68cf15284fe80f8c9e2e /redhat/dependencies/libcarddav/libcarddav.spec | |
| parent | 7acfaa9e6409ed0ebdbc2e6fb67e8bc9b64b33d2 (diff) | |
| parent | 43240f192dbdd0c0d267bc7c4a96f123704f0e2b (diff) | |
| download | tde-packaging-169853a068683db6540e3b77542d5139bb7867d1.tar.gz tde-packaging-169853a068683db6540e3b77542d5139bb7867d1.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/dependencies/libcarddav/libcarddav.spec')
| -rw-r--r-- | redhat/dependencies/libcarddav/libcarddav.spec | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index 9ab0dbd9f..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%{?dist} +Release: 2debian2.1%{?dist}%{?_variant} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ @@ -8,10 +13,18 @@ Packager: Francois Andriot <francois.andriot@free.fr> License: GPL Group: System Environment/Libraries -Summary: A client library that adds support for the CalDAV protocol (rfc4791). +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 +51,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 +63,7 @@ autoreconf --force --install --symlink %{_libdir}/*.so.* %files devel -%{_includedir}/%{name}-0.6.1 +%{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so @@ -54,5 +71,5 @@ autoreconf --force --install --symlink %Changelog -* Fri Oct 21 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 -- Initial build for RHEL 6.0 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 |