[gtkmm30] fix documentation location co-own /usr/share/devhelp
Haïkel Guémar
hguemar at fedoraproject.org
Tue Feb 22 14:49:14 UTC 2011
commit 164d4adfb5dc704fad88d1a7860ed48e80f98471
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date: Tue Feb 22 15:49:10 2011 +0100
fix documentation location
co-own /usr/share/devhelp
gtkmm30.spec | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gtkmm30.spec b/gtkmm30.spec
index 1333076..8ccd792 100644
--- a/gtkmm30.spec
+++ b/gtkmm30.spec
@@ -1,10 +1,11 @@
+%global tarname gtkmm
%global apiver 3.0
# first two digits of version
%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Name: gtkmm30
Version: 2.99.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: C++ interface for the GTK+ library
Group: System Environment/Libraries
@@ -45,6 +46,8 @@ Summary: API documentation for %{name}
Group: Documentation
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
+Requires: glibmm24-doc
+Requires: libsigc++20-doc
%description doc
This package contains the full API documentation for %{name}.
@@ -72,17 +75,9 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT docs-to-include
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-# Fix documentation installation, put everything under gtk-doc
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gtkmm-%{apiver}
-mv $RPM_BUILD_ROOT%{_docdir}/gtkmm-%{apiver}/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gtkmm-%{apiver}/
-mv $RPM_BUILD_ROOT%{_datadir}/devhelp/books/gtkmm-%{apiver}/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gtkmm-%{apiver}
-# Fix devhelp broken base tag
-sed -i 's:base="[^\"]*":base="%{_datadir}/gtk-doc/html/gtkmm-%{apiver}/reference/html":' $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gtkmm-%{apiver}/*.devhelp2
-
%check
make check %{?_smp_mflags}
@@ -115,11 +110,16 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(-,root,root,-)
-%{_datadir}/gtk-doc/
-%doc _docs/*
-
+%doc %{_docdir}/%{tarname}-%{apiver}/*
+# according guidelines, we can own this
+# since devhelp is not required for consulting documentation
+%{_datadir}/devhelp
%changelog
+* Tue Feb 22 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.99.3-4
+- fix documentation location
+- co-own /usr/share/devhelp
+
* Fri Feb 11 2011 Matthias Clasen <mclasen at redhat.com> - 2.99.3-3
- Rebuild against newer gtk
More information about the scm-commits
mailing list