[libsigc++20/f15/master] fix documentation location RHBZ #678981 set BA to noarch and add requirements to devel package

Haïkel Guémar hguemar at fedoraproject.org
Mon Feb 21 17:01:00 UTC 2011


commit cd20d8d0942607786bc5ad67c4d066ca41ad467e
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date:   Mon Feb 21 17:56:01 2011 +0100

    fix documentation location RHBZ #678981
    set BA to noarch and add requirements to devel package

 libsigc++20.spec |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/libsigc++20.spec b/libsigc++20.spec
index 1683627..a476678 100644
--- a/libsigc++20.spec
+++ b/libsigc++20.spec
@@ -1,6 +1,6 @@
 Name:           libsigc++20
 Version:        2.2.8
-Release:        2%{?dist}
+Release:        3%{?dist}.1
 
 Summary:        Typesafe signal framework for C++
 
@@ -45,7 +45,8 @@ needed for development with %name.
 %package        doc
 Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
-
+BuildArch:      noarch
+Requires:       %name = %{version}-%{release}-devel
 
 %description    doc
 This package contains the full API documentation for %{name}.
@@ -60,12 +61,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
@@ -95,10 +90,15 @@ 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-3
+- fix documentation location (RHBZ #678981)
+- co-own /usr/share/devhelp
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list