From cf843e5b5f0083f4a59e36c5e9486e3360f24cc4cddd35db8e334a9e688f5c7a Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sun, 13 Feb 2011 16:37:22 +0000
Subject: [PATCH] Accepting request 60469 from home:fcrozat:gnome3

thanks

OBS-URL: https://build.opensuse.org/request/show/60469
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=135
---
 glib2-use-old-pcre.patch | 26 ++++++++++++++++++++++++++
 glib2.spec               | 14 ++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/glib2-use-old-pcre.patch b/glib2-use-old-pcre.patch
index d7fdcb7..a288512 100644
--- a/glib2-use-old-pcre.patch
+++ b/glib2-use-old-pcre.patch
@@ -92,3 +92,29 @@ index 6e015e9..ef3ac68 100644
    g_test_init (&argc, &argv, NULL);
  
    g_test_add_func ("/regex/basic", test_basic);
+From 9f0c592b9c5f9ac57d3454f02ffa92e98001ceaf Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27@gmail.com>
+Date: Sat, 22 Jan 2011 15:36:13 +0000
+Subject: [PATCH] Bump PCRE minimum version
+
+https://bugzilla.gnome.org/show_bug.cgi?id=640261
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ca101c5..38bd583 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2611,7 +2611,7 @@ AC_MSG_RESULT($broken_poll)
+ dnl *********************
+ dnl *** GRegex checks ***
+ dnl *********************
+-PCRE_REQUIRED_VERSION=7.2
++PCRE_REQUIRED_VERSION=8.11
+ 
+ # Check if we should compile GRegex
+ AC_ARG_ENABLE(regex, AC_HELP_STRING([--disable-regex],
+-- 
+1.7.1
+
diff --git a/glib2.spec b/glib2.spec
index c85a6a3..7672f41 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -266,6 +266,11 @@ NOCONFIGURE=1 ./autogen.sh
 %endif
 
 %build
+#needed by patch0
+%if !0%{?BUILD_FROM_VCS}
+autoreconf -I m4macros
+%endif
+
 %configure \
     --enable-static \
     --enable-selinux \
@@ -273,10 +278,11 @@ NOCONFIGURE=1 ./autogen.sh
 %if 0%{?with_systemtap}
     --enable-systemtap \
 %endif
-%if 0%{?BUILD_FROM_VCS}
-    --enable-gtk-doc \
-%endif
-    --with-runtime-libdir=../../%{_lib}
+    --with-runtime-libdir=../../%{_lib} \
+#%if 0%{?BUILD_FROM_VCS}
+#    --enable-gtk-doc
+#%endif
+
 %{__make} %{?_smp_mflags}
 %if 0%{?BUILD_FROM_VCS}
 %{__make} ChangeLog