[atkmm/f14/master] upstream atkmm 2.22.2 split doc into subpackage

Haïkel Guémar hguemar at fedoraproject.org
Mon Feb 21 21:56:32 UTC 2011


commit 4dd73874a66f0371b80dedc02b3811c2b77c7910
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Mon Feb 21 22:41:04 2011 +0100

    upstream atkmm 2.22.2
    split doc into subpackage

 atkmm.spec |   40 +++++++++++++++++++++++++++++-----------
 sources    |    2 +-
 2 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/atkmm.spec b/atkmm.spec
index bda893f..0349285 100644
--- a/atkmm.spec
+++ b/atkmm.spec
@@ -3,8 +3,8 @@
 %global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           atkmm
-Version:        2.22.0
-Release:        1%{?dist}
+Version:        2.22.2
+Release:        2%{?dist}
 Summary:        C++ interface for the ATK library
 
 Group:          System Environment/Libraries
@@ -39,6 +39,21 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%package          doc
+Summary:          Developer's documentation for the atkmm library
+Group:            Documentation
+BuildArch:        noarch
+Requires:         libsigc++20-doc
+Requires:         glibmm24-doc
+
+%description      doc
+This package contains developer's documentation for the atkmm
+library. Pangomm is the C++ API for the ATK accessibility toolkit library.
+
+The documentation can be viewed either through the devhelp
+documentation browser or through a web browser.
+
+
 %prep
 %setup -q
 
@@ -53,14 +68,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# Fix documentation installation, put everything under gtk-doc and fix
-# relative paths.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/atkmm-%{apiver}
-mv $RPM_BUILD_ROOT%{_docdir}/atkmm-%{apiver}/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/atkmm-%{apiver}/
-mv $RPM_BUILD_ROOT%{_datadir}/devhelp/books/atkmm-%{apiver}/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/atkmm-%{apiver}
-# Fix broken devhelp base tag
-sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/atkmm-%{apiver}/reference/html":' $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/atkmm-%{apiver}/*.devhelp2
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,10 +90,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/atkmm-%{apiver}/
-%{_datadir}/gtk-doc/
+
+
+%files doc
+%defattr(-, root, root, -)
+%doc %{_docdir}/%{name}-%{apiver}/*
+%{_datadir}/devhelp/
 
 
 %changelog
+* Mon Feb 21 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.22.2-3
+- Update to 2.22.2
+- split doc into subpackage
+- fix documentation location
+- co-own /usr/share/devhelp
+
 * Tue Sep 28 2010 Kalev Lember <kalev at smartlink.ee> - 2.22.0-1
 - Update to 2.22.0
 
diff --git a/sources b/sources
index ada4539..d1a5426 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6faeedb26810fd954a856f05e03d4ea8  atkmm-2.22.0.tar.bz2
+7541d8c3fc80c1ac2bb1887e1642eb5f  atkmm-2.22.2.tar.bz2


More information about the scm-commits mailing list