diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
| commit | a615d19df88eb2e989316b480519161945dbc7dc (patch) | |
| tree | 369970b98042998b86c11024598155e037b76fec /redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec | |
| parent | 76a93e0011ade1583a1ec672f33411dfd35454f3 (diff) | |
| download | tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip | |
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec')
| -rw-r--r-- | redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec index d09b0fed7..152f1cf90 100644 --- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec +++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.2 -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} Summary: A portable CardDAV client implementation Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -56,15 +56,11 @@ BuildRequires: make BuildRequires: libtool # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define libcurl_devel libcurl-devel %else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel -%else # Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel trinity-libcurl-devel %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -151,6 +147,7 @@ This package contains the development files. %prep %setup -q -n libcarddav-%{version} +%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/" autoreconf --force --install --symlink @@ -195,13 +192,4 @@ fi %__rm -rf %{buildroot} -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4 -- Build for Fedora 19 - -* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3 -- Renames to 'trinity-libcaldav' -- Build on MGA2 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2debian2 .1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 +%changelog |