rpms/libgdamm/F-12 .cvsignore, 1.12, 1.13 libgdamm.spec, 1.18, 1.19 sources, 1.12, 1.13

[Denis Leroy]

Author: denis

Update of /cvs/pkgs/rpms/libgdamm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28353

Modified Files:
	.cvsignore libgdamm.spec sources 
Log Message:
Update to upstream 3.99.17.1. Added documentation under gtk-doc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	25 Jun 2009 07:16:02 -0000	1.12
+++ .cvsignore	29 Sep 2009 18:48:31 -0000	1.13
@@ -1 +1 @@
-libgdamm-3.99.15.tar.bz2
+libgdamm-3.99.17.1.tar.bz2


Index: libgdamm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/F-12/libgdamm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libgdamm.spec	25 Jul 2009 05:41:24 -0000	1.18
+++ libgdamm.spec	29 Sep 2009 18:48:31 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		libgdamm
-Version:	3.99.15
-Release:	2%{?dist}
+Version:	3.99.17.1
+Release:	1%{?dist}
 Summary:	C++ wrappers for libgda
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -37,6 +37,17 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 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/libgdamm-4.0
+mv ${RPM_BUILD_ROOT}%{_docdir}/libgdamm-4.0/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0/
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/libgdamm-4.0/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgdamm-4.0
+
+# Fix devhelp broken base
+sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/libgdamm-4.0/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libgdamm-4.0/*.devhelp2
+# Remove old doc directory
+rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/libgdamm-4.0
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -44,26 +55,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-, root, root, -)
 %{_includedir}/libgdamm-4.0
 %{_libdir}/*.so
 %{_libdir}/libgdamm-4.0
 %{_libdir}/pkgconfig/*.pc
+%doc %{_datadir}/gtk-doc/html/libgdamm-4.0
+
 
 %changelog
+* Sat Sep 26 2009 Denis Leroy <denis at poolshark.org> - 3.99.17.1-1
+- Update to upstream 3.99.17.1
+- Added documentation under gtk-doc
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.99.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Thu Jun 25 2009 Denis Leroy <denis at poolshark.org> - 3.99.15-1
 - Update to upstream 3.99.15, as part of glom update
 
-* Mon Mar 23 2009  <denis at poolshark.org> - 3.99.14-1
+* Mon Mar 23 2009 Denis Leroy <denis at poolshark.org> - 3.99.14-1
 - Update to upstream 3.99.14
 
 * Wed Mar  4 2009 Denis Leroy <denis at poolshark.org> - 3.99.12-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	25 Jun 2009 07:16:02 -0000	1.12
+++ sources	29 Sep 2009 18:48:31 -0000	1.13
@@ -1 +1 @@
-a2ce57fc1e04fe87a63429b3ca87ff1c  libgdamm-3.99.15.tar.bz2
+227d838905b45e8ccd6440cf661630fc  libgdamm-3.99.17.1.tar.bz2