OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=32

glib2-libtool.diff

@@ -0,0 +1,40 @@
+--- configure.in
++++ configure.in
+@@ -1272,7 +1272,11 @@ if test x"$glib_native_win32" = xyes; th
+   G_MODULE_LDFLAGS=
+ else
+   export SED
++  if test -x libtool; then
+   G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  else
++  G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  fi
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1337,8 +1341,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+ 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ 	echo "void glib_plugin_test(void) { }" > plugin.c
++	if test -x libtool; then
+ 	${SHELL} ./libtool --mode=compile ${CC} -shared \
+ 		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
++	else
++	libtool --mode=compile ${CC} -shared \
++		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
++	fi
+ 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ 		glib_cv_rtldglobal_broken,[
+ 		AC_TRY_RUN([
+@@ -1411,7 +1420,11 @@ fi
+ 
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
++if test -x libtool; then
+ shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++else
++shrext_cmds=`libtool --config | grep '^shrext_cmds='`
++fi
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot

glib2.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Apr 12 00:10:15 CEST 2008 - maw@suse.de
+
+- Tag glib2-libtool.diff, which was added in the previous
+  submission.
+
+-------------------------------------------------------------------
+Fri Apr 11 14:04:50 CEST 2008 - schwab@suse.de
+
+- Work around broken configure script.
+
 -------------------------------------------------------------------
 Wed Apr  9 23:13:06 CEST 2008 - maw@suse.de
 

glib2.spec

@@ -18,7 +18,7 @@ License:        LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Version:        2.16.3
-Release:        1
+Release:        2
 Summary:        A Library with Convenient Functions Written in C
 Url:            http://www.gtk.org/
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
@@ -42,6 +42,8 @@ Patch3:         glib2-allocsize.patch
 Patch4:         glib2-bnc373149-bgo518160-gbookmark-optimizations.diff
 # PATCH-FIX-UPSTREAM glib2-bnc373149-bgo523877-gbookmark-optimizations.diff bnc373149 bgo523877 federico@novell.com - backport GBookmark optimizations (2)
 Patch5:         glib2-bnc373149-bgo523877-gbookmark-optimizations.diff
+# PATCH-FIX-UPSTREAM glib2-libtool.diff schwab@suse.de -- apparently configure.in is invoking libtool in a bad way
+Patch6:         glib2-libtool.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-lang = %{version}
 # For temporary %%pre script only.
@@ -368,6 +370,7 @@ Authors:
 %patch3
 %patch4 -p1
 %patch5 -p1
+%patch6
 cp -a %{S:1} %{S:2} %{S:3} .
 cp -a %{S:4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
@@ -498,6 +501,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/gtk-doc/html
 
 %changelog
+* Sat Apr 12 2008 maw@suse.de
+- Tag glib2-libtool.diff, which was added in the previous
+  submission.
+* Fri Apr 11 2008 schwab@suse.de
+- Work around broken configure script.
 * Thu Apr 10 2008 maw@suse.de
 - Update to version 2.16.3:
   + Bugs fixed: bgo#521513, bgo#316221, bgo#520914, bgo#521045,