rpms/glibmm24/EL-5 .cvsignore, 1.15, 1.16 glibmm.spec, 1.19, 1.20 sources, 1.16, 1.17

[Denis Leroy (denis)]

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32358

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
- Update to 2.12.10
- Put documentation under datadir/gtk-doc/html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Apr 2007 14:27:17 -0000	1.15
+++ .cvsignore	10 Jul 2007 09:37:49 -0000	1.16
@@ -1 +1 @@
-glibmm-2.12.8.tar.bz2
+glibmm-2.12.10.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/EL-5/glibmm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- glibmm.spec	30 Apr 2007 14:27:17 -0000	1.19
+++ glibmm.spec	10 Jul 2007 09:37:49 -0000	1.20
@@ -1,12 +1,12 @@
 Name:           glibmm24
-Version:        2.12.8
+Version:        2.12.10
 Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.10/glibmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
@@ -40,11 +40,14 @@
 
 
 %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}/glibmm-2.4/* docs-to-include/
+
+# 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/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,21 +61,26 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README CHANGES
 %{_libdir}/*.so.*
 
 
 %files devel
 %defattr(-, root, root, -)
-%doc CHANGES docs-to-include/*
 %{_includedir}/glibmm-2.4
 %{?_with_static: %{_libdir}/*.a}
 %{_libdir}/*.so
 %{_libdir}/glibmm-2.4
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/*.m4
+%doc %{_datadir}/gtk-doc/html/glibmm-2.4
+
 
 %changelog
+* Tue Jul 10 2007 Denis Leroy <denis at poolshark.org> - 2.12.10-1
+- Update to 2.12.10
+- Put documentation under datadir/gtk-doc/html
+
 * Mon Apr 30 2007 Denis Leroy <denis at poolshark.org> - 2.12.8-1
 - Update to 2.12.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/EL-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Apr 2007 14:27:17 -0000	1.16
+++ sources	10 Jul 2007 09:37:49 -0000	1.17
@@ -1 +1 @@
-e2a596f484cd5e328e568f6035efb8d2  glibmm-2.12.8.tar.bz2
+85830693d669f0d86d6e64db3b57f581  glibmm-2.12.10.tar.bz2