diff options
Diffstat (limited to 'redhat/dependencies/libcaldav')
| -rw-r--r-- | redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch | 193 | ||||
| -rw-r--r-- | redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec | 195 | ||||
| -rw-r--r-- | redhat/dependencies/libcaldav/libcaldav.spec (renamed from redhat/dependencies/libcaldav/libcaldav-14.0.0.spec) | 61 |
3 files changed, 34 insertions, 415 deletions
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch deleted file mode 100644 index 0cf9f056b..000000000 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c -index 68a4377..35aef48 100644 ---- a/src/add-caldav-object.c -+++ b/src/add-caldav-object.c -@@ -103,7 +103,6 @@ gboolean caldav_add(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c -index 9a85168..ea5733f 100644 ---- a/src/delete-caldav-object.c -+++ b/src/delete-caldav-object.c -@@ -150,7 +150,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - g_free(search); - curl_slist_free_all(http_header); -@@ -249,7 +248,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - caldav_unlock_object( -@@ -380,7 +378,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - g_free(search); - curl_slist_free_all(http_header); -@@ -479,7 +476,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - caldav_unlock_object( -diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c -index d916259..0021cb8 100644 ---- a/src/get-caldav-report.c -+++ b/src/get-caldav-report.c -@@ -169,7 +169,6 @@ gboolean caldav_getall(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -266,7 +265,6 @@ gboolean caldav_getrange(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -349,7 +347,6 @@ gboolean caldav_tasks_getall(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -446,7 +443,6 @@ gboolean caldav_tasks_getrange(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/get-display-name.c b/src/get-display-name.c -index 8fc0ff8..c205efd 100644 ---- a/src/get-display-name.c -+++ b/src/get-display-name.c -@@ -99,7 +99,6 @@ gboolean caldav_getname(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c -index f75ab92..40a5a3c 100644 ---- a/src/get-freebusy-report.c -+++ b/src/get-freebusy-report.c -@@ -104,7 +104,6 @@ gboolean caldav_freebusy(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c -index 30f2d20..6845551 100644 ---- a/src/lock-caldav-object.c -+++ b/src/lock-caldav-object.c -@@ -107,7 +107,6 @@ gchar* caldav_lock_object( - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -@@ -211,7 +210,6 @@ gboolean caldav_unlock_object(gchar* lock_token, gchar* URI, - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c -index fb3a4d0..f3563d8 100644 ---- a/src/modify-caldav-object.c -+++ b/src/modify-caldav-object.c -@@ -151,7 +151,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - http_header = NULL; -@@ -249,7 +248,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) { - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -@@ -391,7 +389,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - http_header = NULL; -@@ -489,7 +486,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) { - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c -index 1d97d04..0045afe 100644 ---- a/src/options-caldav-server.c -+++ b/src/options-caldav-server.c -@@ -74,7 +74,6 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res == 0) { - gchar* head; -@@ -102,15 +101,12 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu - } - else if ( - (res == CURLE_SSL_CONNECT_ERROR || -- CURLE_PEER_FAILED_VERIFICATION || - CURLE_SSL_ENGINE_NOTFOUND || - CURLE_SSL_ENGINE_SETFAILED || - CURLE_SSL_CERTPROBLEM || - CURLE_SSL_CIPHER || - CURLE_SSL_CACERT || -- CURLE_SSL_CACERT_BADFILE || -- CURLE_SSL_CRL_BADFILE || -- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) { -+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) { - error->code = -2; - error->str = g_strdup(error_buf); - } diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec deleted file mode 100644 index 419ff8ff9..000000000 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ /dev/null @@ -1,195 +0,0 @@ -# -# 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_pkg libcaldav -%define tde_prefix /opt/trinity -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libcaldav %{_lib}caldav -%else -%define libcaldav libcaldav -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 0.6.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} -Summary: A client library that adds support for the CalDAV protocol (rfc4791) -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: libcaldav_0.6.5-2debian2.tar.gz - -BuildRequires: make -BuildRequires: libtool -BuildRequires: fdupes - -# GTK2 support -%if 0%{?rhel} == 4 -BuildRequires: evolution28-gtk2-devel -%else -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -%endif - -# CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel libcurl-devel -%else -# Specific CURL version for TDE on RHEL 5 (and older) -%define libcurl_devel trinity-libcurl-devel -%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 -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. - -This package includes the development files. - -%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 - -%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} -autoreconf --force --install --symlink - - -%build -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -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=%{_docdir}/libcaldav \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - \ - --disable-dependency-tracking - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/*.a - -# Fix doc dir -mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/ - -# Fix include dir -mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/libcaldav/ - -# Fix duplicate files -%fdupes %{?buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav.spec index a4bf7ebb2..88c6f7abf 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity @@ -54,8 +54,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: libcaldav-14.0.1-rhel5.patch - +BuildRequires: cmake >= 2.8 BuildRequires: make BuildRequires: libtool BuildRequires: fdupes @@ -100,7 +99,7 @@ easy to integrate CalDAV support into any PIM application. %defattr(-,root,root,-) %{_libdir}/libcaldav.so.0 %{_libdir}/libcaldav.so.0.0.6 -%{_docdir}/libcaldav-%{version}/ +%{_docdir}/libcaldav/ %post -n %{libcaldav}0 /sbin/ldconfig @@ -151,45 +150,53 @@ This package includes the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 5 -%patch1 -p1 -b .ftbfs -%endif -autoreconf -fiv %build -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --docdir=%{_docdir}/libcaldav \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{_datadir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/*.a - -# Fix doc dir -mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/ +%__make install DESTDIR=%{buildroot} -C build # Fix duplicate files %fdupes %{?buildroot} +# Fix doc directory +%if "%{_docdir}" != "%{_datadir}/doc" +%__mkdir_p "%{?buildroot}/%{_docdir}" +%__mv -f "%{?buildroot}/%{_datadir}/doc/libcaldav" "%{?buildroot}/%{_docdir}/libcaldav" +%endif + %clean %__rm -rf %{buildroot} |