From 2f5a88eca0dc5cd93c4bb896265e9187cc9726f37c4d8b8fed58f1c5d041db17 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 6 Mar 2007 08:04:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=6 --- glib2-unexpanded-variables.patch | 16 ---------------- glib2.changes | 5 +++++ glib2.spec | 6 +++--- 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 glib2-unexpanded-variables.patch diff --git a/glib2-unexpanded-variables.patch b/glib2-unexpanded-variables.patch deleted file mode 100644 index d93c7f2..0000000 --- a/glib2-unexpanded-variables.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- m4macros/glib-gettext.m4 -+++ m4macros/glib-gettext.m4 -@@ -369,7 +369,12 @@ - if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` - else -- localedir=`eval echo "${datadir}/locale"` -+ localedir="${datadir}/locale" -+ while true; do -+ expanded_localedir=`eval echo "$localedir"` -+ test "x$expanded_localedir" = "x$localedir" && break -+ localedir="$expanded_localedir" -+ done - fi - prefix="$glib_save_prefix" - exec_prefix="$glib_save_exec_prefix" diff --git a/glib2.changes b/glib2.changes index e995cb1..f8640dc 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 5 18:06:21 CET 2007 - jhargadon@suse.de + +- removed obsolete patch glib2-unexpanded-variables.patch (#249204) + ------------------------------------------------------------------- Thu Feb 22 15:31:17 CET 2007 - sbrabec@suse.cz diff --git a/glib2.spec b/glib2.spec index e0474af..83dc336 100644 --- a/glib2.spec +++ b/glib2.spec @@ -17,7 +17,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/C and C++ Autoreqprov: on Version: 2.12.9 -Release: 2 +Release: 4 Summary: A Library with Convenient Functions Written in C URL: http://www.gtk.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2 @@ -25,7 +25,6 @@ Source1: glib2.sh Source2: glib2.csh Patch0: glib-mkinstalldirs.patch Patch1: glib-aclocal.patch -Patch2: glib2-unexpanded-variables.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # For temporary %%pre script only. PreReq: coreutils @@ -115,7 +114,6 @@ Authors: %setup -q -n %{_name}-%{version} %patch0 %patch1 -%patch2 %build autoreconf -f -i @@ -164,6 +162,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/gobject %changelog +* Mon Mar 05 2007 - jhargadon@suse.de +- removed obsolete patch glib2-unexpanded-variables.patch (#249204) * Thu Feb 22 2007 - sbrabec@suse.cz - Removal of gnome-filesystem files moved to opt_gnome-compat. * Fri Feb 16 2007 - maw@suse.de