[libgdamm] upstream 4.1.2 put doc in sub-package

Haïkel Guémar hguemar at fedoraproject.org
Mon Feb 28 11:19:27 UTC 2011


commit bea959afc8c57cc02fa2d242c8d397547b63c0ee
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date:   Mon Feb 28 12:19:10 2011 +0100

    upstream 4.1.2
    put doc in sub-package

 libgdamm.spec |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/libgdamm.spec b/libgdamm.spec
index 36443e7..7bcdbc9 100644
--- a/libgdamm.spec
+++ b/libgdamm.spec
@@ -1,6 +1,8 @@
+%global api_ver 4.0
+
 Name:		libgdamm
-Version:	4.1.1
-Release:	2%{?dist}
+Version:	4.1.2
+Release:	1%{?dist}
 Summary:	C++ wrappers for libgda
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -25,6 +27,16 @@ Requires:	pkgconfig
 This package contains headers and libraries that programmers will need 
 to develop applications which use libgdamm.
 
+%package        doc
+Summary:        API documentation for %{name}
+Group:          Documentation
+BuildArch:      noarch
+BuildRequires:  doxygen graphviz
+Requires:       gtkmm24-docs
+
+%description    doc
+This package contains the full API documentation for %{name}.
+
 %prep
 %setup -q
 
@@ -37,17 +49,6 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# Fix documentation installation, put everything under gtk-doc
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0
-mv ${RPM_BUILD_ROOT}%{_docdir}/libgdamm-4.0/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0/
-mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/libgdamm-4.0/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0
-
-# Fix devhelp broken base
-sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/libgdamm-4.0/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libgdamm-4.0/*.devhelp2
-# Remove old doc directory
-rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/libgdamm-4.0
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,10 +69,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/libgdamm-4.0
 %{_libdir}/pkgconfig/*.pc
-%doc %{_datadir}/gtk-doc/html/libgdamm-4.0
+
+%files doc
+%defattr(-, root, root, -)
+%doc COPYING
+%doc %{_datadir}/devhelp/books/%{name}-%{api_ver}
+%doc %{_docdir}/%{name}-%{api_ver}
 
 
 %changelog
+* Mon Feb 28 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 4.1.2-1
+- Update to upstream 4.1.2
+- put doc in sub-package
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list