[gtkmm24/f15/master] fix documentation location co-own /usr/share/devhelp
Haïkel Guémar
hguemar at fedoraproject.org
Tue Feb 22 12:22:02 UTC 2011
commit af30327945d743673d16b845cccc006f98692cfe
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date: Tue Feb 22 13:21:59 2011 +0100
fix documentation location
co-own /usr/share/devhelp
gtkmm24.spec | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/gtkmm24.spec b/gtkmm24.spec
index 5c9165a..900a2b6 100644
--- a/gtkmm24.spec
+++ b/gtkmm24.spec
@@ -1,9 +1,11 @@
# first two digits of version
-%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
+%global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
+%global tarname gtkmm
+%global api_ver 2.4
Name: gtkmm24
Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ interface for GTK2 (a GUI library for X)
@@ -48,7 +50,8 @@ Summary: Documentation for %{name}, includes full API docs
Group: Documentation
BuildArch: noarch
Requires: %{name}-devel = %{version}-%{release}
-
+Requires: glibmm24-doc
+Requires: libsigc++20-doc
%description docs
This package contains the full API documentation for %{name}.
@@ -72,15 +75,6 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
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/gtkmm-2.4
-mv ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/
-mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.4/*.devhelp2 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4
-# Fix devhelp broken base tag
-sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/gtkmm-2.4/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/*.devhelp2
-# Remove old doc directory
-rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gtkmm-2.4
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -112,10 +106,13 @@ rm -rf $RPM_BUILD_ROOT
%files docs
%defattr(-, root, root, -)
-%{_datadir}/gtk-doc/
-
+%doc %{_docdir}/%{tarname}-%{api_ver}/*
+%{_datadir}/devhelp
%changelog
+* Mon Feb 21 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.24.0-2
+- fix documentation location
+
* Thu Feb 10 2011 Kalev Lember <kalev at smartlink.ee> - 2.24.0-1
- Update to 2.24.0
- Use macro for automatically figuring out the download URL
More information about the scm-commits
mailing list