[xorg-x11-docs] Install docs to %{_pkgdocdir} where available.

Ville Skyttä scop at fedoraproject.org
Fri Jul 26 19:01:05 UTC 2013


commit 21fe4349c006dacc1a5b9da12da2d1669223fb5d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Jul 26 22:00:29 2013 +0300

    Install docs to %{_pkgdocdir} where available.

 xorg-x11-docs.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/xorg-x11-docs.spec b/xorg-x11-docs.spec
index 9ed8fc5..99263bf 100644
--- a/xorg-x11-docs.spec
+++ b/xorg-x11-docs.spec
@@ -1,9 +1,10 @@
 %define tarname xorg-docs
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Summary: X.Org X11 documentation
 Name: xorg-x11-docs
 Version: 1.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Documentation
 URL: http://www.x.org
@@ -21,8 +22,6 @@ BuildRequires: xmlto >= 0.0.24-2
 BuildRequires: xmlto-tex fop
 BuildRequires: java-1.7.0-openjdk
 
-%define x11docdir %{_datadir}/doc/xorg-x11-docs-%{version}
-
 %description
 Protocol and other technical documentation for the X.Org X11 X Window System
 implementation.
@@ -33,7 +32,7 @@ implementation.
 
 %build
 autoreconf -v --install || exit 1
-%configure --docdir=%{x11docdir}
+%configure --docdir=%{_pkgdocdir}
 make
 
 %install
@@ -47,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{x11docdir}
+%{_pkgdocdir}
 %{_mandir}/man7/Consortium.7*
 %{_mandir}/man7/Standards.7*
 %{_mandir}/man7/X.7*
@@ -56,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/Xsecurity.7*
 
 %changelog
+* Fri Jul 26 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.6-7
+- Install docs to %%{_pkgdocdir} where available.
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list