Accepting request 96468 from home:dimstar:branches:GNOME:Factory

Update to 2.31.4

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

glib-2.31.2.tar.bz2

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

glib-2.31.4.tar.xz

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

glib2.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Dec 13 12:33:58 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 2.31.4:
+  + Experimental: Menu support has been added to GApplication.
+  + GDBusConnection previously directly dispatched destroy notifies
+    when unregistering objects if the current main context was the
+    same context the object was exported on. It now unconditionally
+    dispatches these through an idle on the context.
+  + Clean up requiers in .pc files.
+  + Introduce GBytes, a data type for immutable, fixed-size byte
+    sequences. This makes the pre-existing GBuffer API available
+    outside GLib
+  + GDBusInterfaceSkeleton can now be exported on multiple
+    connections.
+  + Bugs fixed: bgo#600161, bgo#640077, bgo#641720, bgo#648516,
+    bgo#651997, bgo#652560, bgo#662208, bgo#662718, bgo#663291,
+    bgo#664406, bgo#664455, bgo#664558, bgo#664559, bgo#664617,
+    bgo#664635, bgo#664809, bgo#665067, bgo#665184, bgo#665298,
+    bgo#665391, bgo#665607, bgo#665634, bgo#665685, bgo#665733.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+
 -------------------------------------------------------------------
 Wed Nov 30 09:50:42 UTC 2011 - coolo@suse.com
 

glib2.spec

@@ -20,7 +20,7 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.31.2
+Version:        2.31.4
 Release:        1
 # 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
@@ -28,7 +28,7 @@ License:        LGPLv2+
 Summary:        General-Purpose Utility Library
 Url:            http://www.gtk.org/
 Group:          System/Libraries
-Source:         http://download.gnome.org/sources/glib/2.31/%{_name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/glib/2.31/%{_name}-%{version}.tar.xz
 Source1:        glib2.sh
 Source2:        glib2.csh
 Source3:        SuSEconfig.glib2
@@ -64,6 +64,8 @@ BuildRequires:  python
 BuildRequires:  systemtap-sdt-devel
 %endif
 BuildRequires:  translation-update-upstream
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  pkgconfig(libpcre)

gtk-doc.m4

@@ -6,6 +6,7 @@ dnl Usage:
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
 AC_DEFUN([GTK_DOC_CHECK],
 [
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
@@ -33,6 +34,11 @@ AC_DEFUN([GTK_DOC_CHECK],
                         AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
       [PKG_CHECK_EXISTS([gtk-doc >= $1],,
                         AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+    dnl don't check for glib if we build glib
+    if test "x$PACKAGE_NAME" != "xglib"; then
+      dnl don't fail if someone does not have glib
+      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
+    fi
   fi
 
   AC_MSG_CHECKING([whether to build gtk-doc documentation])