rpms/glib2/devel .cvsignore, 1.118, 1.119 glib2.spec, 1.228, 1.229 sources, 1.120, 1.121

Matthias Clasen mclasen at fedoraproject.org
Mon Jan 25 21:48:08 UTC 2010


Author: mclasen

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

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.23.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- .cvsignore	21 Dec 2009 16:05:50 -0000	1.118
+++ .cvsignore	25 Jan 2010 21:48:08 -0000	1.119
@@ -1 +1 @@
-glib-2.23.1.tar.bz2
+glib-2.23.2.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- glib2.spec	21 Dec 2009 16:05:50 -0000	1.228
+++ glib2.spec	25 Jan 2010 21:48:08 -0000	1.229
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.23.1
+Version: 2.23.2
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -66,7 +66,6 @@ awk '/^Overview of Changes/ { seen+=1 }
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 ## glib2.sh and glib2.csh
@@ -79,14 +78,45 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modu
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
 
+case "$host" in 
+  alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
+    mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-64
+    ;;
+  *)
+    mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-32
+    ;;
+esac
+
 %find_lang glib20
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+
+case "$host" in
+  alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
+    %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
+    ;;
+  *)
+    %{_bindir}/gio-querymodules-32 %{_libdir}/gio/modules
+    ;;
+esac
+
+
+%postun
+/sbin/ldconfig
+
+case "$host" in
+  alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
+    %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
+    ;;
+  *)
+    %{_bindir}/gio-querymodules-32 %{_libdir}/gio/modules
+    ;;
+esac
 
-%postun -p /sbin/ldconfig
 
 %files -f glib20.lang
 %defattr(-, root, root, -)
@@ -100,6 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/gio
 %dir %{_libdir}/gio/modules
 %{_libdir}/gio/modules/libgiofam.so
+%{_bindir}/gio-querymodules*
 
 %files devel
 %defattr(-, root, root, -)
@@ -123,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Jan 25 2010 Matthias Clasen <mclasen at redhat.com> - 2.23.2-1
+- Update to 2.23.2
+
 * Mon Dec 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.23.1-1
 - Update to 2.23.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- sources	21 Dec 2009 16:05:50 -0000	1.120
+++ sources	25 Jan 2010 21:48:08 -0000	1.121
@@ -1 +1 @@
-fb637f6122690254097d0b6d470f6ed3  glib-2.23.1.tar.bz2
+5613fadc27b1cb64f234aed4babfa17b  glib-2.23.2.tar.bz2



More information about the scm-commits mailing list