[GtkAda] Install the info documentation correctly.

Björn Persson rombobeorn at fedoraproject.org
Fri Jul 20 01:55:25 UTC 2012


commit 2bdbb189328cac2c045a4314789f65f64912d088
Author: Björn Persson <bjorn at rombobjörn.se>
Date:   Fri Jul 20 03:46:28 2012 +0200

    Install the info documentation correctly.

 GtkAda.spec |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/GtkAda.spec b/GtkAda.spec
index 2ea82e1..2e5fc90 100644
--- a/GtkAda.spec
+++ b/GtkAda.spec
@@ -1,6 +1,6 @@
 Name:           GtkAda
 Version:        2.24.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Ada binding to GTK+
 Summary(sv):    Adabinding till GTK+
 Group:          System Environment/Libraries
@@ -112,6 +112,8 @@ Paketet %{name}-gl innehåller %{name}s bindning till OpenGL-gränssnittet.
 Summary:        Documentation for %{name}
 Summary(sv):    Dokumentation till %{name}
 Group:          Documentation
+Requires(post): /sbin/install-info
+Requires(preun):/sbin/install-info
 BuildArch:      noarch
 
 %description doc %{common_description_en}
@@ -144,17 +146,22 @@ make GNATMAKE="gnatmake %{Gnatmake_optflags}"
 %install
 %{make_install} gprdir=%{_GNAT_project_dir}
 
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-(cd docs; install -m 0644 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
+# Also install the manpages.
+mkdir -p %{buildroot}%{_mandir}/man1
+(cd docs; install -m 0644 gate.1 gtkada-config.1 %{buildroot}%{_mandir}/man1)
+
+# Put the info documentation in the right place.
+mkdir -p %{buildroot}%{_infodir}
+mv %{buildroot}%{_docdir}/gtkada/gtkada_ug/gtkada_ug.info --target-directory=%{buildroot}%{_infodir}
 
 # Put the examples in the documentation directory, excluding binaries.
-rm $RPM_BUILD_ROOT%{_datadir}/examples/gtkada/testgtk/testgtk $RPM_BUILD_ROOT%{_datadir}/examples/gtkada/testgtk/testcairo
-mv --no-target-directory $RPM_BUILD_ROOT%{_datadir}/examples/gtkada $RPM_BUILD_ROOT%{_docdir}/gtkada/examples
+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 needs to be replicated in the doc subpackage as it doesn't depend
 # on the main package.
-cp features known-problems COPYING $RPM_BUILD_ROOT%{_docdir}/gtkada
+cp features known-problems COPYING %{buildroot}%{_docdir}/gtkada
 
 
 %post -p /sbin/ldconfig
@@ -172,6 +179,17 @@ cp features known-problems COPYING $RPM_BUILD_ROOT%{_docdir}/gtkada
 %postun gl -p /sbin/ldconfig
 
 
+%post doc
+/sbin/install-info %{_infodir}/gtkada_ug.info.gz %{_infodir}/dir
+exit 0
+
+%preun doc
+if [ $1 -eq 0 ]; then  # if uninstalling, not upgrading
+   /sbin/install-info --delete %{_infodir}/gtkada_ug.info.gz %{_infodir}/dir
+fi
+exit 0
+
+
 %files
 %{_libdir}/libgtkada-*.so.*
 %doc AUTHORS COPYING README
@@ -200,9 +218,13 @@ cp features known-problems COPYING $RPM_BUILD_ROOT%{_docdir}/gtkada
 
 %files doc
 %{_docdir}/gtkada
+%{_infodir}/*
 
 
 %changelog
+* Fri Jul 20 2012 Björn Persson <bjorn at rombobjörn.se> - 2.24.2-3
+- The info version of the user's guide is now installed correctly.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list