rpms/glib2/F-12 glib-i386-atomic.patch, 1.2, 1.3 glib2.spec, 1.232, 1.233

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10392

Modified Files:
	glib2.spec 
Added Files:
	glib-i386-atomic.patch 
Log Message:
Reinstate i386 atomic patch; apparently still needed


glib-i386-atomic.patch:
 configure |    5 -----
 1 file changed, 5 deletions(-)

Index: glib-i386-atomic.patch
===================================================================
RCS file: glib-i386-atomic.patch
diff -N glib-i386-atomic.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ glib-i386-atomic.patch	1 Feb 2010 23:23:52 -0000	1.3
@@ -0,0 +1,15 @@
+diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure
+--- glib-2.16.6/configure.atomic	2008-10-27 18:24:20.000000000 -0400
++++ glib-2.16.6/configure	2008-10-27 18:24:31.000000000 -0400
+@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse
+ 
+ if test x"$GCC" = xyes; then
+   case $host_cpu in
+-    i386)
+-      { $as_echo "$as_me:$LINENO: result: none" >&5
+-$as_echo "none" >&6; }
+-      glib_memory_barrier_needed=no
+-      ;;
+     i?86)
+       { $as_echo "$as_me:$LINENO: result: i486" >&5
+ $as_echo "i486" >&6; }


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- glib2.spec	7 Jan 2010 02:45:39 -0000	1.232
+++ glib2.spec	1 Feb 2010 23:23:53 -0000	1.233
@@ -3,13 +3,14 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 Source: http://download.gnome.org/sources/glib/2.22/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
+Patch0: glib-i386-atomic.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.14
 BuildRequires: gamin-devel
@@ -58,7 +59,7 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-
+%patch0 -p1 -b i386-atomic
 
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
@@ -135,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb  1 2010 Matthias Clasen <mclasen at redhat.com> - 2.22.4-2
+- Reinstate a patch that protects against $host being i386
+
 * Wed Jan  6 2010 Matthias Clasen <mclasen at redhat.com> - 2.22.4-1
 - Update to 2.22.4
 - See http://download.gnome.org/sources/glib/2.22/glib-2.22.4.news