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

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

glib-2.25.16.tar.bz2

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

glib-2.25.17.tar.bz2

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

glib2-fix-build-system-pcre.patch

@@ -1,26 +0,0 @@
-From 2ae579d1b5e215ec57c602358cd3fd3ffe9b314d Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Sat, 18 Sep 2010 16:52:58 +0000
-Subject: Fix header cleaup fallout when using system pcre
-
-Using the internal pcre has the side effect of exposing gregex.c to
-glib.h.  When we use the system one, we lose that, so we need to
-explicitly include the things we use (glist, gatomic, etc..)
----
-diff --git a/glib/gregex.c b/glib/gregex.c
-index f21fbe8..b62bda7 100644
---- a/glib/gregex.c
-+++ b/glib/gregex.c
-@@ -32,6 +32,10 @@
- #include "gtypes.h"
- #include "gregex.h"
- #include "glibintl.h"
-+#include "glist.h"
-+#include "gmessages.h"
-+#include "gstrfuncs.h"
-+#include "gatomic.h"
- 
- /**
-  * SECTION:gregex
---
-cgit v0.8.3.1

glib2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Sep 19 09:24:16 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.25.17:
+  + Fix build when compiling against the system-installed pcre
+    library (bgo#629971).
+- Drop glib2-fix-build-system-pcre.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Sat Sep 18 10:33:58 CEST 2010 - vuntz@opensuse.org
 

glib2.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package glib2 (Version 2.25.16)
+# spec file for package glib2 (Version 2.25.17)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,7 +20,7 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.25.16
+Version:        2.25.17
 Release:        1
 # FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
 # FIXME: remove python BuildRequires once sr#43603 is accepted
@@ -40,8 +40,6 @@ Source5:        macros.glib2
 # Please update this file from the latest gtk-doc package:
 Source6:        gtk-doc.m4
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM glib2-fix-build-system-pcre.patch bgo#629971 vuntz@opensuse.org -- Taken from git
-Patch0:         glib2-fix-build-system-pcre.patch
 # PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID
 Patch8:         glib2-bnc379332-desktop-su.patch
 # PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream
@@ -223,7 +221,6 @@ to a C programmer and is used by Gtk+ and GNOME.
 %prep
 %setup -q -n %{_name}-%{version}
 translation-update-upstream
-%patch0 -p1
 %patch8
 %patch10 -p1
 %patch11 -p1