[dojo] Install docs to %{_pkgdocdir} where available (#993728).

Ville Skyttä scop at fedoraproject.org
Thu Dec 12 19:42:32 UTC 2013


commit cf71fb6f72eee4c2be779436b4d17cf81e6cef49
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Dec 12 21:42:33 2013 +0200

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

 dojo.spec |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/dojo.spec b/dojo.spec
index d5073e6..0bcfc1f 100644
--- a/dojo.spec
+++ b/dojo.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:           dojo
 Version:        1.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Modular JavaScript toolkit
 Group:          Applications/Publishing
 # See http://dojotoolkit.org/license
@@ -63,7 +65,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 # Move licensing and documentation to docdir: 
 pushd %{_builddir}/dojo-release-%{version}
   for f in `find . -name LICENSE -o -name README* -o -name NOTICES -o -name build.txt` ; do
-    install -m 0444 -p -D $f $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/$f
+    install -m 0444 -p -D $f $RPM_BUILD_ROOT/%{_pkgdocdir}/$f
     rm $f
   done
 popd
@@ -81,14 +83,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_datadir}/%{name}
-%dir %{_docdir}/%{name}-%{version}
-%dir %{_docdir}/%{name}-%{version}/%{name}
-%dir %{_docdir}/%{name}-%{version}/dojox
-%dir %{_docdir}/%{name}-%{version}/dijit
-%doc %{_docdir}/%{name}-%{version}/*/*
+%{_pkgdocdir}
 
 
 %changelog
+* Thu Dec 12 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.8.3-3
+- Install docs to %%{_pkgdocdir} where available (#993728).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list