[GtkAda: 9/11] Keep all the documentation in one directory, and use upstream's directory for that rather than hacki

Björn Persson rombobeorn at fedoraproject.org
Thu Jul 24 20:56:59 UTC 2014


commit 9c4ed9f11133618a9b8531c566cdc9678ad51956
Author: Björn Persson <Bjorn at Rombobjörn.se>
Date:   Sun Jul 20 23:45:48 2014 +0200

    Keep all the documentation in one directory, and use upstream's directory for that rather than hacking the build system even more and breaking users' bookmarks just for the sake of using _pkgdocdir.

 GtkAda.spec |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/GtkAda.spec b/GtkAda.spec
index 53ecdb9..3924e67 100644
--- a/GtkAda.spec
+++ b/GtkAda.spec
@@ -212,10 +212,10 @@ mv %{buildroot}%{_docdir}/gtkada/gtkada_ug/gtkada_ug.info --target-directory=%{b
 rm %{buildroot}%{_datadir}/examples/gtkada/testgtk/testgtk %{buildroot}%{_datadir}/examples/gtkada/testgtk/testcairo
 mv --no-target-directory %{buildroot}%{_datadir}/examples/gtkada %{buildroot}%{_docdir}/gtkada/examples
 
-# features and known-problems belong with the documentation for developers.
-# The license and the list of authors need to be replicated in the doc
-# subpackage as it doesn't depend on the main package.
-install --mode=u=rw,go=r,a-s --preserve-timestamps features known-problems COPYING AUTHORS %{buildroot}%{_docdir}/gtkada
+# Include these documentation files.
+install --mode=u=rw,go=r,a-s --preserve-timestamps AUTHORS COPYING README features known-problems %{buildroot}%{_docdir}/gtkada
+# There is a COPYING3 in the 2.24.2 tarball, but the source files' headers say
+# version 2 or later, so COPYING3 is left out of the package for now.
 
 
 %check
@@ -250,9 +250,10 @@ exit 0
 
 %files
 %{_libdir}/libgtkada-*.so.*
-%doc AUTHORS COPYING README
-# There is a COPYING3 in the 2.24.2 tarball, but the source files' headers say
-# version 2 or later, so COPYING3 is left out of the package for now.
+%dir %{_docdir}/gtkada
+%{_docdir}/gtkada/AUTHORS
+%{_docdir}/gtkada/COPYING
+%{_docdir}/gtkada/README
 
 
 %files gnome
@@ -274,7 +275,17 @@ exit 0
 
 
 %files doc
-%{_docdir}/gtkada
+# features and known-problems belong with the documentation for developers.
+# The license, the list of authors and the directory need to be replicated in
+# the doc subpackage as it doesn't depend on the main package.
+%dir %{_docdir}/gtkada
+%{_docdir}/gtkada/AUTHORS
+%{_docdir}/gtkada/COPYING
+%{_docdir}/gtkada/features
+%{_docdir}/gtkada/known-problems
+%{_docdir}/gtkada/gtkada_ug
+%{_docdir}/gtkada/gtkada_rm
+%{_docdir}/gtkada/examples
 %{_infodir}/*
 %{_datadir}/gps
 


More information about the scm-commits mailing list