[gfal2] - Update doc directory path for F20 - Bug 993771

Devresse adev at fedoraproject.org
Mon Aug 12 20:36:42 UTC 2013


commit a50bf0396e2fd4a619cb04792584e21554e820f9
Author: Adrien Devresse <Adrien.Devresse at cern.ch>
Date:   Mon Aug 12 18:41:38 2013 +0200

    - Update doc directory path for F20 - Bug 993771

 gfal2.spec |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)
---
diff --git a/gfal2.spec b/gfal2.spec
index 236a268..df2aaa0 100644
--- a/gfal2.spec
+++ b/gfal2.spec
@@ -1,7 +1,9 @@
+# fedora packaging issue https://bugzilla.redhat.com/show_bug.cgi?id=993771
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:				gfal2
 Version:			2.3.0
-Release:			2%{?dist}
+Release:			4%{?dist}
 Summary:			Grid file access library 2.0
 Group:				Applications/Internet
 License:			ASL 2.0
@@ -174,7 +176,7 @@ make clean
 
 %build
 %cmake \
--DDOC_INSTALL_DIR=%{_docdir}/%{name}-%{version} \
+-DDOC_INSTALL_DIR=%{_pkgdocdir} \
 -DUNIT_TESTS=TRUE \
 .
 make %{?_smp_mflags}
@@ -203,24 +205,24 @@ make DESTDIR=%{buildroot} install
 
 %files
 %{_bindir}/gfal2_version
-%{_docdir}/%{name}-%{version}/DESCRIPTION
-%{_docdir}/%{name}-%{version}/VERSION
+%{_pkgdocdir}/DESCRIPTION
+%{_pkgdocdir}/VERSION
 %{_mandir}/man1/gfal2_version.1*
 
 %files core
 %{_libdir}/libgfal2.so.*
 %dir %{_libdir}/%{name}-plugins
-%dir %{_docdir}/%{name}-%{version}
+%dir %{_pkgdocdir}
 %dir %{_sysconfdir}/%{name}.d
 %{_libdir}/%{name}-plugins/libgfal_plugin_file.so*
-%{_docdir}/%{name}-%{version}/README_PLUGIN_FILE
-%{_docdir}/%{name}-%{version}/LICENSE
+%{_pkgdocdir}/README_PLUGIN_FILE
+%{_pkgdocdir}/LICENSE
 %config(noreplace) %{_sysconfdir}/%{name}.d/bdii.conf
 %config(noreplace) %{_sysconfdir}/%{name}.d/gfal2_core.conf
 
 %files transfer
 %{_libdir}/libgfal_transfer.so.*
-%{_docdir}/%{name}-%{version}/README_TRANSFER
+%{_pkgdocdir}/README_TRANSFER
 
 %files devel
 %{_includedir}/%{name}/
@@ -228,47 +230,51 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/gfal_transfer.pc
 %{_libdir}/libgfal2.so
 %{_libdir}/libgfal_transfer.so
-%{_docdir}/%{name}-%{version}/RELEASE-NOTES
+%{_pkgdocdir}/RELEASE-NOTES
 
 %files doc
-%{_docdir}/%{name}-%{version}/html/
-%{_docdir}/%{name}-%{version}/examples/
+%{_pkgdocdir}/html/
+%{_pkgdocdir}/examples/
 
 %files plugin-lfc
 %{_libdir}/%{name}-plugins/libgfal_plugin_lfc.so*
-%{_docdir}/%{name}-%{version}/README_PLUGIN_LFC
+%{_pkgdocdir}/README_PLUGIN_LFC
 %config(noreplace) %{_sysconfdir}/%{name}.d/lfc_plugin.conf
 
 %files plugin-rfio
 %{_libdir}/%{name}-plugins/libgfal_plugin_rfio.so*
-%{_docdir}/%{name}-%{version}/README_PLUGIN_RFIO
+%{_pkgdocdir}/README_PLUGIN_RFIO
 %config(noreplace) %{_sysconfdir}/%{name}.d/rfio_plugin.conf
 
 %files plugin-dcap
 %{_libdir}/%{name}-plugins/libgfal_plugin_dcap.so*
-%{_docdir}/%{name}-%{version}/README_PLUGIN_DCAP
+%{_pkgdocdir}/README_PLUGIN_DCAP
 %config(noreplace) %{_sysconfdir}/%{name}.d/dcap_plugin.conf
 
 %files plugin-srm
 %{_libdir}/%{name}-plugins/libgfal_plugin_srm.so*
-%{_docdir}/%{name}-%{version}/README_PLUGIN_SRM
+%{_pkgdocdir}/README_PLUGIN_SRM
 %config(noreplace) %{_sysconfdir}/%{name}.d/srm_plugin.conf
 
 %files plugin-gridftp
 %{_libdir}/%{name}-plugins/libgfal_plugin_gridftp.so*
-%{_docdir}/%{name}-%{version}/README_PLUGIN_GRIDFTP
+%{_pkgdocdir}/README_PLUGIN_GRIDFTP
 %config(noreplace) %{_sysconfdir}/%{name}.d/gsiftp_plugin.conf
 
 %files plugin-http
 %{_libdir}/%{name}-plugins/libgfal_plugin_http.so*
-%{_docdir}/%{name}-%{version}/README_PLUGIN_HTTP
+%{_pkgdocdir}/README_PLUGIN_HTTP
 %config(noreplace) %{_sysconfdir}/%{name}.d/http_plugin.conf
 
 %files all
-%{_docdir}/%{name}-%{version}/README
+%{_pkgdocdir}/README
 
 
 %changelog
+* Mon Aug 12 2013 Adrien Devresse <adevress at cern.ch>  - 2.3.0-4
+ - docdir unversionned related change  
+
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list