rpms/glibmm24/F-11 .cvsignore, 1.36, 1.37 glibmm.spec, 1.56, 1.57 sources, 1.37, 1.38

[Denis Leroy]

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31413

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to upstream 2.20.2. Doc tweaks merged from F-12 spec, new mm-common based config


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	31 Mar 2009 22:10:49 -0000	1.36
+++ .cvsignore	5 Feb 2010 14:25:06 -0000	1.37
@@ -1 +1 @@
-glibmm-2.20.0.tar.bz2
+glibmm-2.20.2.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/F-11/glibmm.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- glibmm.spec	15 Dec 2009 07:15:48 -0000	1.56
+++ glibmm.spec	5 Feb 2010 14:25:06 -0000	1.57
@@ -1,12 +1,12 @@
 Name:           glibmm24
-Version:        2.20.0
-Release:        2%{?dist}
+Version:        2.20.2
+Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.20/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
@@ -61,10 +61,12 @@ 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/*.devhelp $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/*.devhelp
-rm -fr $RPM_BUILD_ROOT%{_datadir}/devhelp/books/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/
+# Fix devhelp broken base tag
+sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/glibmm-2.4/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp2
+# Remove old doc directory
+rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/glibmm-2.4
 
 
 %clean
@@ -92,6 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/glibmm-2.4
 %{_libdir}/giomm-2.4
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/glibmm-2.4
 %{_datadir}/aclocal/*.m4
 
 
@@ -101,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb  5 2010 Denis Leroy <denis at poolshark.org> - 2.20.2-1
+- Update to upstream 2.20.2
+- Doc tweaks merged from F-12 spec, new mm-common based config
+
 * Mon May  4 2009 Denis <denis at poolshark.org> - 2.20.0-2
 - Added doxygen and graphviz BRs to generate doc graphs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/F-11/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	31 Mar 2009 22:10:49 -0000	1.37
+++ sources	5 Feb 2010 14:25:06 -0000	1.38
@@ -1 +1 @@
-38fa409b531144c238b6e2532e351799  glibmm-2.20.0.tar.bz2
+659ed7b3a123b23e686a1c422f216f7e  glibmm-2.20.2.tar.bz2