From c13999fd890b764e813943db71fd03b410e18f2f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 25 Jan 2010 21:48:08 +0000 Subject: [PATCH] 2.23.2 --- .cvsignore | 2 +- glib2.spec | 42 ++++++++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9f35650..b6bffc9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glib-2.23.1.tar.bz2 +glib-2.23.2.tar.bz2 diff --git a/glib2.spec b/glib2.spec index 38b064e..f065bc7 100644 --- a/glib2.spec +++ b/glib2.spec @@ -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/modules/*.{a,la} 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 - 2.23.2-1 +- Update to 2.23.2 + * Mon Dec 20 2009 Matthias Clasen - 2.23.1-1 - Update to 2.23.1 diff --git a/sources b/sources index 66051ce..dbeb5e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb637f6122690254097d0b6d470f6ed3 glib-2.23.1.tar.bz2 +5613fadc27b1cb64f234aed4babfa17b glib-2.23.2.tar.bz2