Accepting request 110295 from home:vuntz:branches:GNOME:Factory

Update to 2.31.22, with zlib change

OBS-URL: https://build.opensuse.org/request/show/110295
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=188

glib-2.31.20.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3475e1d866c462a36b89d4bae91181513c390ad0af25f445618321da1e022c2a
-size 6069744

glib-2.31.22.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f7dd3f13f23192d78c131bac3fcd8c5e9fe38fd415faa7bfc1d1f178de556d4
+size 6091720

glib2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Mar 20 15:25:20 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 2.31.22:
+  + Bugs fixed: bgo#531901, bgo#653167, bgo#668973, bgo#669797,
+    bgo#670846, bgo#671664, bgo#671676, bgo#671918, bgo#671942,
+    bgo#671997, bgo#672013, bgo#672026, bgo#672095, bgo#672201,
+    bgo#672239, bgo#672249.
+  + Updated translations.
+- Change zlib-devel BuildRequires to its pkgconfig() variant:
+  pkgconfig(zlib).
+
 -------------------------------------------------------------------
 Mon Mar  5 15:34:35 UTC 2012 - vuntz@opensuse.org
 

glib2.spec

@@ -20,9 +20,8 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.31.20
+Version:        2.31.22
 Release:        0
-# FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
 # FIXME: find out if tapsets should really be in devel package or in main package
 Summary:        General-Purpose Utility Library
 License:        LGPL-2.1+
@@ -66,9 +65,9 @@ BuildRequires:  python
 BuildRequires:  systemtap-sdt-devel
 %endif
 BuildRequires:  translation-update-upstream
-BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(zlib)
 %if 0%{?BUILD_FROM_VCS}
 # It's important to keep those BuildRequires inside
 # BUILD_FROM_VCS to avoid build loops in Factory