diff options
| author | Timothy Pearson <[email protected]> | 2011-11-04 12:48:59 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-11-04 12:48:59 -0500 |
| commit | 169853a068683db6540e3b77542d5139bb7867d1 (patch) | |
| tree | 2163209e7dc0569f9b0f68cf15284fe80f8c9e2e /redhat/dependencies/libcaldav/libcaldav.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/libcaldav/libcaldav.spec')
| -rw-r--r-- | redhat/dependencies/libcaldav/libcaldav.spec | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 220913b3b..6624409cd 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.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: libcaldav Version: 0.6.5 -Release: 2debian2%{?dist} +Release: 2debian2.1%{?dist}%{?_variant} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ @@ -10,8 +15,17 @@ License: GPL Group: System Environment/Libraries Summary: A client library that adds support for the CalDAV protocol (rfc4791). +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: libcaldav_0.6.5-2debian2.tar.gz +%if 0%{?fedora} || 0%{?rhel} >= 6 +BuildRequires: libcurl-devel +%else +# Specific CURL version for TDE on RHEL 5 (and older) +BuildRequires: trinity-libcurl-devel +%endif + %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 @@ -38,6 +52,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.2/*.h %{buildroot}%{_includedir} +%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.2 + %clean %__rm -rf %{buildroot} @@ -47,7 +65,7 @@ autoreconf --force --install --symlink %{_datadir}/doc/%{name} %files devel -%{_includedir}/%{name}-0.6.2 +%{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so @@ -55,5 +73,5 @@ autoreconf --force --install --symlink %Changelog -* Fri Oct 21 2011 Francois Andriot <[email protected]> - 0.6.5-2debian2 -- Initial build for RHEL 6.0 +* Sun Oct 30 2011 Francois Andriot <[email protected]> - 0.6.5-2debian2.1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 |