rpms/gtkmm24/devel gtkmm.spec,1.26,1.27

[Denis Leroy (denis)]

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10609

Modified Files:
	gtkmm.spec 
Log Message:
Fixed documentation devhelp support


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkmm.spec	21 Jun 2007 15:18:41 -0000	1.26
+++ gtkmm.spec	22 Jun 2007 10:21:47 -0000	1.27
@@ -17,12 +17,14 @@
 BuildRequires:  glib2-devel >= 2.8.0
 BuildRequires:  cairomm-devel >= 1.1.12
 
+
 %description
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2.
 Highlights include typesafe callbacks, widgets extensible via inheritance
 and a comprehensive set of widget classes that can be freely combined to
 quickly create complex user interfaces.
 
+
 %package        devel
 Summary:        Headers for developing programs that will use %{name}.
 Group:          Development/Libraries
@@ -34,15 +36,18 @@
 Requires:       pango-devel
 Requires:       cairomm-devel
 
+
 %description devel
 This package contains the static libraries and header files needed for
 developing gtkmm applications.
 
+
 %package        docs
 Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
 Requires:       %{name}-devel = %{version}-%{release}
 
+
 %description    docs
 This package contains the full API documentation for %{name}.
 
@@ -57,12 +62,17 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT docs-to-include
+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} ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4/* docs-to-include/
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.4/*
+
+# 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/*.devhelp ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4
+sed -i 's:../../../doc/gtkmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/*.devhelp
+rm -r ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,6 +89,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-, root, root, -)
 %doc CHANGES PORTING
@@ -92,14 +103,16 @@
 %{_libdir}/gdkmm-2.4
 %{_libdir}/pkgconfig/*.pc
 
+
 %files docs
 %defattr(-, root, root, -)
-%doc docs-to-include/*
+%doc %{_datadir}/gtk-doc/html/gtkmm-2.4
 
 
 %changelog
 * Thu Jun 21 2007 Denis Leroy <denis at poolshark.org> - 2.11.3-1
 - Update to unstable 2.11 tree to follow gtk2 version
+- Fixed documentation devhelp support
 
 * Mon Apr 30 2007 Denis Leroy <denis at poolshark.org> - 2.10.9-1
 - Update to 2.10.9