[python-zope-i18n] Install docs to %{_pkgdocdir} where available (#994066).

Ville Skyttä scop at fedoraproject.org
Sat Dec 14 19:41:44 UTC 2013


commit 75279fd639d9e042364252c17848e8103e870922
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Dec 14 21:41:48 2013 +0200

    Install docs to %{_pkgdocdir} where available (#994066).

 python-zope-i18n.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/python-zope-i18n.spec b/python-zope-i18n.spec
index 0952e1c..12e510c 100644
--- a/python-zope-i18n.spec
+++ b/python-zope-i18n.spec
@@ -1,9 +1,10 @@
 %global modname zope.i18n
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Summary: Zope Internationalization Support
 Name: python-zope-i18n
 Version: 3.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 # Patch for FHS compliance
 Patch0: zope.i18n-fhs-datadir.patch
@@ -48,14 +49,14 @@ localization and also provides:
 %install
 %{__python} setup.py install --root=%{buildroot}
 # deal with documents
-mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/locales/
-cp -p *.txt %{buildroot}%{_docdir}/%{name}-%{version}/
+mkdir -p %{buildroot}%{_pkgdocdir}/locales/
+cp -p *.txt %{buildroot}%{_pkgdocdir}/
 mv %{buildroot}%{python_sitelib}/zope/i18n/*.txt \
-   %{buildroot}%{_docdir}/%{name}-%{version}/
+   %{buildroot}%{_pkgdocdir}/
 mv %{buildroot}%{python_sitelib}/zope/i18n/locales/*.txt \
-   %{buildroot}%{_docdir}/%{name}-%{version}/locales/
+   %{buildroot}%{_pkgdocdir}/locales/
 mv %{buildroot}%{python_sitelib}/zope/i18n/locales/data/license.html \
-   %{buildroot}%{_docdir}/%{name}-%{version}/locales/
+   %{buildroot}%{_pkgdocdir}/locales/
 
 install -m 0755 -d %{buildroot}%{_datadir}/%{name}/locales/
 DATADIR=%{_datadir}/%{name}
@@ -74,7 +75,7 @@ done
 %dir %{_datadir}/%{name}/locales/
 %dir %{_datadir}/%{name}/locales/data/
 %{_datadir}/%{name}/locales/data/root.xml
-%{_docdir}/%{name}-%{version}/
+%{_pkgdocdir}/
 %{python_sitelib}/zope/i18n/
 %exclude %{python_sitelib}/zope/i18n/tests/
 %exclude %{python_sitelib}/zope/i18n/locales/tests/
@@ -83,6 +84,9 @@ done
 
 
 %changelog
+* Sat Dec 14 2013 Ville Skyttä <ville.skytta at iki.fi> - 3.8.0-3
+- Install docs to %%{_pkgdocdir} where available (#994066).
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list