rpms/glibmm24/devel glibmm-2.21.5-devhelp.patch, NONE, 1.1 glibmm.spec, 1.59, 1.60

[Denis Leroy]

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv367

Modified Files:
	glibmm.spec 
Added Files:
	glibmm-2.21.5-devhelp.patch 
Log Message:
Fixed postprocessing of devhelp links

glibmm-2.21.5-devhelp.patch:
 glibmm-2.4.devhelp2 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibmm-2.21.5-devhelp.patch ---
--- glibmm-2.21.5/docs/reference/glibmm-2.4.devhelp2~	2009-09-08 20:53:54.000000000 +0200
+++ glibmm-2.21.5/docs/reference/glibmm-2.4.devhelp2	2009-09-14 15:58:20.465208463 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<book xmlns="http://www.devhelp.net/book" title="glibmm Reference Manual" name="glibmm-2.4" base="http://library.gnome.org/devel/glibmm/unstable" link="index.html" version="2" language="c++">
+<book xmlns="http://www.devhelp.net/book" title="glibmm Reference Manual" name="glibmm-2.4" link="index.html" version="2" language="c++">
   <chapters>
     <sub name="Modules" link="modules.html">
       <sub name="Character Set Conversion" link="group__CharsetConv.html"/>


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- glibmm.spec	14 Sep 2009 09:10:54 -0000	1.59
+++ glibmm.spec	14 Sep 2009 14:26:24 -0000	1.60
@@ -7,6 +7,7 @@ Group:          System Environment/Libra
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2
+Patch0:         glibmm-2.21.5-devhelp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
@@ -44,6 +45,7 @@ This package contains the full API docum
 
 %prep
 %setup -q -n glibmm-%{version}
+%patch0 -p1 -b .devhelp
 
 
 %build
@@ -60,10 +62,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 
 # Fix documentation installation, put everything under gtk-doc
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4
-%{__mv} ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
-sed -i 's:../../../doc/glibmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp2
-rm -fr $RPM_BUILD_ROOT%{_datadir}/devhelp/books/glibmm-2.4
+mv ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/reference/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
+# Remove old doc directory
+rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/glibmm-2.4
 
 
 %clean