rpms/glib2/devel glib-abort-msg.patch, NONE, 1.1 glib2.spec, 1.229, 1.230

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16621

Modified Files:
	glib2.spec 
Added Files:
	glib-abort-msg.patch 
Log Message:
Don't use __abort_msg from glibc


glib-abort-msg.patch:
 gtestutils.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE glib-abort-msg.patch ---
diff -up glib-2.23.2/glib/gtestutils.c.abort_msg glib-2.23.2/glib/gtestutils.c
--- glib-2.23.2/glib/gtestutils.c.abort_msg	2010-01-25 18:32:10.793495994 -0500
+++ glib-2.23.2/glib/gtestutils.c	2010-01-25 18:33:23.898497049 -0500
@@ -40,7 +40,12 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
- 
+
+/* We can't use the libc variable, since rpm doesn't let us depend on
+ * GLIBC_PRIVATE symbols.
+ */
+#undef HAVE_LIBC_ABORT_MSG
+
 /* if we have a recent enough glibc, use its __abort_msg variable for storing
  * assertion messages (just like assert()). If not, declare our own variable,
  * so that platforms with older glibc or different libc implementations can use


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- glib2.spec	25 Jan 2010 21:48:08 -0000	1.229
+++ glib2.spec	25 Jan 2010 23:37:08 -0000	1.230
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.23.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -22,6 +22,9 @@ BuildRequires: zlib-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=594872
+Patch0: glib-abort-msg.patch
+
 %description
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -154,6 +157,9 @@ esac
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Jan 25 2010 Matthias Clasen <mclasen at redhat.com> - 2.23.2-2
+- Drop the dependency on a GLIBC_PRIVATE symbol
+
 * Mon Jan 25 2010 Matthias Clasen <mclasen at redhat.com> - 2.23.2-1
 - Update to 2.23.2