[glibmm24/f14/master] fix documentation location

[Haïkel Guémar]

commit 4a4e64b4003d97638a2a06db5bd4ef77c5f34976
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date:   Mon Feb 21 16:09:04 2011 +0100

    fix documentation location

 glibmm24.spec |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/glibmm24.spec b/glibmm24.spec
index 52f5939..a5b259c 100644
--- a/glibmm24.spec
+++ b/glibmm24.spec
@@ -1,6 +1,9 @@
+%global tarname glibmm
+%global api_ver 2.4
+
 Name:           glibmm24
 Version:        2.24.2
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        C++ interface for the GLib library
 
 Group:          System Environment/Libraries
@@ -37,14 +40,14 @@ Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
-
+Requires:       libsigc++20-doc
 
 %description    doc
 This package contains the full API documentation for %{name}.
 
 
 %prep
-%setup -q -n glibmm-%{version}
+%setup -q -n %{tarname}-%{version}
 
 
 %build
@@ -63,15 +66,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf tools
 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/glibmm-2.4
-mv ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
-mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
-# Fix devhelp broken base tag
-sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/glibmm-2.4/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp2
-# Remove old doc directory
-rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/glibmm-2.4
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,10 +98,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-, root, root, -)
-%{_datadir}/gtk-doc/
+%doc %{_docdir}/%{tarname}-%{api_ver}/*
+# according guidelines, we can co-own this, since devhelp is not required
+# for accessing documentation
+%{_datadir}/devhelp/
 
 
 %changelog
+* Mon Feb 21 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.24.2-2
+- Fix documentation location
+- Co-own /usr/share/devhelp
+
 * Wed Sep 29 2010 jkeating - 2.24.2-1.1
 - Rebuilt for gcc bug 634757