From 9c7bde4fee4817bdf97ef9387e47332077179638 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 19 May 2010 22:27:18 +0000
Subject: [PATCH] 2.25.6

---
 .cvsignore |  2 +-
 glib2.spec | 40 +++++++++-------------------------------
 sources    |  2 +-
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index b75fb3b..621483a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glib-2.25.5.tar.bz2
+glib-2.25.6.tar.bz2
diff --git a/glib2.spec b/glib2.spec
index b7cf5b0..2e7c8ac 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -2,8 +2,8 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.25.5
-Release: 2%{?dist}
+Version: 2.25.6
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -82,45 +82,19 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
 # Install multilib wrappers for the binaries
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gio-modules
 
-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
-
+mv  $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-%{__isa_bits}
 
 %find_lang glib20
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %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
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 
 
 %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
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 
 
 %files -f glib20.lang
@@ -184,6 +158,10 @@ esac
 %{_libdir}/lib*.a
 
 %changelog
+* Wed May 19 2010 Matthias Clasen <mclasen@redhat.com> - 2.25.6-1
+- Update to 2.25.6
+- Simplify gio-querymodules handling
+
 * Mon May 17 2010 Matthias Clasen <mclasen@redhat.com> - 2.25.5-2
 - Remove an erroneous removal
 
diff --git a/sources b/sources
index 8828ffa..bdf8896 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86973aa98f227c2bddf7312e668b9b70  glib-2.25.5.tar.bz2
+bd47fb74e7b479ce25015694abd42abd  glib-2.25.6.tar.bz2