rpms/gtkmm24/FC-4 gtkmm-2.6.5-devhelp.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gtkmm.spec, 1.8, 1.9 sources, 1.5, 1.6

[Denis Leroy (denis)]

Author: denis

Update of /cvs/extras/rpms/gtkmm24/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16248

Modified Files:
	.cvsignore gtkmm.spec sources 
Added Files:
	gtkmm-2.6.5-devhelp.patch 
Log Message:
Update to 2.6.5, fixed devhelp documentation pashs

gtkmm-2.6.5-devhelp.patch:

--- NEW FILE gtkmm-2.6.5-devhelp.patch ---
--- gtkmm-2.6.5.origt/docs/reference/doxygen_to_devhelp.xsl	2005-12-18 23:38:23.000000000 -0800
+++ gtkmm-2.6.5/docs/reference/doxygen_to_devhelp.xsl	2004-01-02 01:56:46.000000000 -0800
@@ -5,7 +5,7 @@
 
 <xsl:output method="xml" version="1.0" indent="yes"/>
 
-<xsl:param name="reference_prefix">../../../doc/gtkmm-2.4/docs/reference/html/</xsl:param>
+<xsl:param name="reference_prefix">reference/html/</xsl:param>
 
 <xsl:template match="/">
   <book title="gtkmm 2.4 library Reference Manual"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Apr 2005 22:36:05 -0000	1.3
+++ .cvsignore	19 Dec 2005 09:52:29 -0000	1.4
@@ -1 +1 @@
-gtkmm-2.6.2.tar.bz2
+gtkmm-2.6.5.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-4/gtkmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtkmm.spec	29 Apr 2005 11:16:25 -0000	1.8
+++ gtkmm.spec	19 Dec 2005 09:52:29 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gtkmm24
-Version:        2.6.2
-Release:        2
+Version:        2.6.5
+Release:        1
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -8,6 +8,7 @@
 License:        LGPL
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.6/gtkmm-%{version}.tar.bz2
+Patch0:         gtkmm-2.6.5-devhelp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -49,20 +50,19 @@
 
 %prep
 %setup -q -n gtkmm-%{version}
+%patch0 -p1 -b .devhelp
 
 
 %build
 %configure --enable-static --enable-shared --disable-examples --disable-demos
-make %{?_smp_mflags}
+rm -f docs/reference/gtkmm-2.4.devhelp
+make -C docs/reference gtkmm-2.4.devhelp gtkmm_docdir=%{_datadir}/gtk-doc/html/gtkmm-2.4 devhelpdir=%{_datadir}/gtk-doc/html/gtkmm-2.4
+make %{?_smp_mflags} gtkmm_docdir=%{_datadir}/gtk-doc/html/gtkmm-2.4 devhelpdir=%{_datadir}/gtk-doc/html/gtkmm-2.4
 
 
 %install
-rm -rf $RPM_BUILD_ROOT docs-to-include
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT  gtkmm_docdir=%{_datadir}/gtk-doc/html/gtkmm-2.4 devhelpdir=%{_datadir}/gtk-doc/html/gtkmm-2.4
 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/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,10 +96,13 @@
 
 %files docs
 %defattr(-, root, root, -)
-%doc docs-to-include/*
-
+%{_datadir}/gtk-doc/html/gtkmm-2.4
 
 %changelog
+* Sun Dec 18 2005 Denis Leroy <denis at poolshark.org> - 2.6.5-1
+- Update to 2.6.5
+- Fixed devhelp documentation paths
+
 * Fri Apr 29 2005 Denis Leroy <denis at poolshark.org> - 2.6.2-2
 - Disabled building of demo and examples
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Apr 2005 22:36:05 -0000	1.5
+++ sources	19 Dec 2005 09:52:29 -0000	1.6
@@ -1 +1 @@
-c1ffa447172b16d1ee787b1c69379c30  gtkmm-2.6.2.tar.bz2
+b7c3e15de77c58c309adb68aff51b34c  gtkmm-2.6.5.tar.bz2