[dmlite/f20] Documentation installed in an unversioned doc dir

Alejandro Alvarez aalvarez at fedoraproject.org
Fri Aug 30 10:02:25 UTC 2013


commit 4adf7b619e5866f3f589c6f01e8ddf4c71066c63
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Aug 30 12:02:03 2013 +0200

    Documentation installed in an unversioned doc dir

 dmlite.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/dmlite.spec b/dmlite.spec
index 942c3c0..c273d5d 100644
--- a/dmlite.spec
+++ b/dmlite.spec
@@ -1,6 +1,10 @@
+# Unversioned doc dirs in fedora >= 20
+# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		dmlite
 Version:	0.6.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Common libraries for grid data management and storage
 Group:		Applications/Internet
 License:	ASL 2.0
@@ -80,6 +84,11 @@ mkdir -p %{buildroot}
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/%{_libdir}/dmlite
 
+# Move the versioned doc to the unversioned one in fedora >= 20
+%if %{?fedora}%{!?fedora:0} >= 20
+mv %{buildroot}/%{_defaultdocdir}/%{name}-%{version} %{buildroot}/%{_pkgdocdir} 
+%endif
+
 %clean
 rm -rf %{buildroot}
 
@@ -104,9 +113,12 @@ rm -rf %{buildroot}
 %files docs
 %defattr(-,root,root,-)
 %{_mandir}/man3/*
-%{_defaultdocdir}/%{name}-%{version}
+%{_pkgdocdir}
 
 %changelog
+* Fri Aug 30 2013 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 0.6.1-4
+- Documentation installed in an unversioned doc dir
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list