diff --git a/glib-2.27.92.tar.bz2 b/glib-2.27.92.tar.bz2 deleted file mode 100644 index 401fb4a..0000000 --- a/glib-2.27.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb8230a152899474cc285bb9776d77ad64a8660977a159688e8caf1d277ec510 -size 6994516 diff --git a/glib-2.28.0.tar.bz2 b/glib-2.28.0.tar.bz2 new file mode 100644 index 0000000..d49b8b2 --- /dev/null +++ b/glib-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0605f538e5c022c237c97a34496979ba71d33c7b10b8d8edb84435498a651fb3 +size 6824906 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 +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.changes b/glib2.changes index c261f8d..fa80502 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Feb 13 14:11:08 CET 2011 - vuntz@opensuse.org + +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. + +------------------------------------------------------------------- +Tue Feb 8 20:30:41 UTC 2011 - fcrozat@novell.com + +- Update to version 2.28.0: + + Bugs fixed: bgo#641363, bgo#641395, bgo#641411, bgo#641477, + bgo#641572, bgo#641688 + + Updated translations. +- Update glib2-use-old-pcre.patch to change configure script too. + Add call to autoreconf for the patch. + ------------------------------------------------------------------- Thu Jan 27 10:11:56 CET 2011 - vuntz@opensuse.org diff --git a/glib2.spec b/glib2.spec index 577c058..a877faa 100644 --- a/glib2.spec +++ b/glib2.spec @@ -21,7 +21,7 @@ Name: glib2 %define _name glib -Version: 2.27.92 +Version: 2.28.0 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 @@ -159,7 +159,7 @@ License: LGPLv2+ Summary: General-Purpose Utility Library Group: System/Libraries Requires: %{name}-branding = %{version} -Recommends: %{name}-lang = %{version} +Recommends: %{name}-lang Provides: %{name} = %{version} Obsoletes: %{name} < %{version} # bug437293 @@ -266,17 +266,20 @@ NOCONFIGURE=1 ./autogen.sh %endif %build +%if 0%{?suse_version} <= 1140 +# Needed by patch0 +autoreconf -fi -I m4macros +%endif + %configure \ --enable-static \ --enable-selinux \ --with-pcre=system \ %if 0%{?with_systemtap} --enable-systemtap \ -%endif -%if 0%{?BUILD_FROM_VCS} - --enable-gtk-doc \ %endif --with-runtime-libdir=../../%{_lib} + %{__make} %{?_smp_mflags} %if 0%{?BUILD_FROM_VCS} %{__make} ChangeLog @@ -291,7 +294,7 @@ NOCONFIGURE=1 ./autogen.sh %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -%find_lang %{_name}20 +%find_lang %{_name}20 %{?no_lang_C} mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -D -m0644 glib2.sh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.sh install -D -m0644 glib2.csh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.csh