[goocanvasmm/f14/master] fix documentation location

Haïkel Guémar hguemar at fedoraproject.org
Sun Feb 20 17:14:57 UTC 2011


commit a4350605a2b3bfe4fe7635f42c27a8730dff444f
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Sun Feb 20 18:14:36 2011 +0100

    fix documentation location

 goocanvasmm.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/goocanvasmm.spec b/goocanvasmm.spec
index 875a038..8973ca5 100644
--- a/goocanvasmm.spec
+++ b/goocanvasmm.spec
@@ -2,7 +2,7 @@
 
 Name:           goocanvasmm
 Version:        0.15.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        C++ interface for goocanvas
 
@@ -46,20 +46,14 @@ developing applications with %{name}.
 %build
 %configure --enable-shared
 make %{?_smp_mflags}
-
 # Build documentation
 (cd doc/reference; doxygen -u 2> /dev/null)
-# fix devhelp catalog to point on right location
-sed -i 's#base=".*unstable"#base="%{_datadir}/doc/%{name}-devel-%{version}/html"#' doc/reference/%{name}-%{api_ver}.devhelp2
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mkdir docs-to-include
-mv doc/reference/html docs-to-include/
-rm -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{api_ver}
 
 
 %clean
@@ -80,14 +74,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root, -)
-%doc docs-to-include/*
 %{_includedir}/%{name}-%{api_ver}
 %{_libdir}/%{name}-%{api_ver}/include/goocanvasmmconfig.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/devhelp/books/%{name}-%{api_ver}/%{name}-%{api_ver}.devhelp2
+%doc %{_datadir}/devhelp/books/%{name}-%{api_ver}/%{name}-%{api_ver}.devhelp2
+%doc %{_datadir}/doc/%{name}-%{api_ver}/reference/*
+
 
 %changelog
+* Sun Feb 20 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 0.15.4-2
+- fix devhelp documentation location
+
 * Tue Oct 26 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 0.15.4-1
 - Update to upstream 0.15.4
 


More information about the scm-commits mailing list