[cairomm] fix documentation location
Haïkel Guémar
hguemar at fedoraproject.org
Mon Feb 21 16:32:17 UTC 2011
commit 3c601bcb97c73335415430fa79206d42d8564ff0
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date: Mon Feb 21 17:18:41 2011 +0100
fix documentation location
cairomm.spec | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/cairomm.spec b/cairomm.spec
index 127da3e..7741b7f 100644
--- a/cairomm.spec
+++ b/cairomm.spec
@@ -4,7 +4,7 @@
Summary: C++ API for the cairo graphics library
Name: cairomm
Version: 1.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.cairographics.org
License: LGPLv2+
Group: System Environment/Libraries
@@ -38,7 +38,7 @@ developing %{name} applications.
%package doc
Summary: Developer's documentation for the cairomm library
Group: Documentation
-Requires: devhelp
+Requires: %{name} = %{version}-%{release}-devel
%if 0%{?fedora} > 9 || 0%{?rhel} > 5
BuildArch: noarch
%endif
@@ -65,12 +65,6 @@ hierarchy and can be found at /usr/share/doc/cairomm-1.0
%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
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/cairomm-%{apiver}
-mv $RPM_BUILD_ROOT%{_docdir}/cairomm-%{apiver}/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/cairomm-%{apiver}/
-mv $RPM_BUILD_ROOT%{_datadir}/devhelp/books/cairomm-%{apiver}/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/cairomm-%{apiver}
-# Fix devhelp broken base tag
-sed -i 's:base="[^\"]*":base="%{_datadir}/gtk-doc/html/cairomm-%{apiver}/reference/html":' $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/cairomm-%{apiver}/*.devhelp2
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -94,9 +88,15 @@ sed -i 's:base="[^\"]*":base="%{_datadir}/gtk-doc/html/cairomm-%{apiver}/referen
%files doc
%defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/cairomm-%{apiver}/
+%doc %{_datadir}/doc/%{name}-%{apiver}/*
+# 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> - 1.9.8-2
+- fix documentation location
+- co-own /usr/share/devhelp
+
* Mon Feb 14 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 1.9.8-1
- upstream 1.9.8
- fix issues with f15/rawhide (RHBZ #676878)
More information about the scm-commits
mailing list