From b2329ca8a3a3bdd9164fbf0366199a4dd92f7cd8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 25 Jan 2010 23:37:08 +0000
Subject: [PATCH] Don't use __abort_msg from glibc

---
 glib-abort-msg.patch | 17 +++++++++++++++++
 glib2.spec           |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 glib-abort-msg.patch

diff --git a/glib-abort-msg.patch b/glib-abort-msg.patch
new file mode 100644
index 0000000..c8e173c
--- /dev/null
+++ b/glib-abort-msg.patch
@@ -0,0 +1,17 @@
+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
diff --git a/glib2.spec b/glib2.spec
index f065bc7..c70b25c 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -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@redhat.com> - 2.23.2-2
+- Drop the dependency on a GLIBC_PRIVATE symbol
+
 * Mon Jan 25 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.2-1
 - Update to 2.23.2