OBS User unknown 2007-03-06 08:04:35 +00:00 committed by Git OBS Bridge
parent 41e6996f05
commit 2f5a88eca0
3 changed files with 8 additions and 19 deletions

View File

@ -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"

View File

@ -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

View File

@ -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