[libsigc++20/f14/master] upstream 2.2.8 and fix documentation location

[Haïkel Guémar]

commit b4aa78d1868001292a8ccecd3d2c17d4bb58b0a1
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date:   Mon Feb 21 18:56:13 2011 +0100

    upstream 2.2.8 and fix documentation location

 libsigc++20.spec |   22 ++++++++++++----------
 sources          |    2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/libsigc++20.spec b/libsigc++20.spec
index c025f7a..31c8da2 100644
--- a/libsigc++20.spec
+++ b/libsigc++20.spec
@@ -1,5 +1,5 @@
 Name:           libsigc++20
-Version:        2.2.4.2
+Version:        2.2.8
 Release:        1%{?dist}
 
 Summary:        Typesafe signal framework for C++
@@ -43,7 +43,7 @@ needed for development with %name.
 %package        doc
 Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
-
+BuildArch:      noarch
 
 %description    doc
 This package contains the full API documentation for %{name}.
@@ -58,12 +58,6 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html
-mv  ${RPM_BUILD_ROOT}%{_datadir}/doc/libsigc++-2.0 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html
-mv  ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/libsigc++-2.0/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libsigc++-2.0/
-# Fix documentation link in devhelp file, since we moved the docs to
-# the gtk-doc directory.
-sed -i 's:/usr/share/doc:/usr/share/gtk-doc/html:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libsigc++-2.0/*.devhelp2
 
 
 %clean
@@ -93,10 +87,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-, root, root, -)
-%doc %{_datadir}/gtk-doc/html/libsigc++-2.0
-
+%doc %{_datadir}/doc/libsigc++-2.0/*
+# 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.2.8-1
+- upstream 2.2.8
+- rename spec file to match actual package name
+- fix documentation location (RHBZ #678981)
+- co-own /usr/share/devhelp
+
 * Tue Sep  8 2009 Denis Leroy <denis at poolshark.org> - 2.2.4.2-1
 - Update to upstream version 2.2.4.2
 
diff --git a/sources b/sources
index 3f26056..b5a46cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-545edbb7b54eec4f723323d3158c0e0c  libsigc++-2.2.4.2.tar.bz2
+1198425eab9fd605721a278c651b8dd8  libsigc++-2.2.8.tar.bz2