rpms/gtk2/devel gtk+-2.8.10-abicheck.patch, NONE, 1.1 gtk2.spec, 1.107, 1.108

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29572

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.8.10-abicheck.patch 
Log Message:
Fix abichecking


gtk+-2.8.10-abicheck.patch:
 gdk-pixbuf/abicheck.sh |    2 +-
 gdk/abicheck.sh        |    2 +-
 gtk/abicheck.sh        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gtk+-2.8.10-abicheck.patch ---
--- gtk+-2.8.10/gdk-pixbuf/abicheck.sh.abicheck	2006-01-13 23:15:12.000000000 -0500
+++ gtk+-2.8.10/gdk-pixbuf/abicheck.sh	2006-01-13 23:15:26.000000000 -0500
@@ -1,5 +1,5 @@
 #! /bin/sh
 
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
-nm -D .libs/libgdk_pixbuf-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D -g --defined-only .libs/libgdk_pixbuf-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
--- gtk+-2.8.10/gtk/abicheck.sh.abicheck	2006-01-13 23:14:33.000000000 -0500
+++ gtk+-2.8.10/gtk/abicheck.sh	2006-01-13 23:15:00.000000000 -0500
@@ -1,5 +1,5 @@
 #! /bin/sh
 
 cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
-nm -D .libs/libgtk-x11-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
--- gtk+-2.8.10/gdk/abicheck.sh.abicheck	2006-01-13 23:15:36.000000000 -0500
+++ gtk+-2.8.10/gdk/abicheck.sh	2006-01-13 23:15:50.000000000 -0500
@@ -1,5 +1,5 @@
 #! /bin/sh
 
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
-nm -D .libs/libgdk-x11-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D -g --defined-only .libs/libgdk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gtk2.spec	14 Jan 2006 03:35:13 -0000	1.107
+++ gtk2.spec	14 Jan 2006 04:17:01 -0000	1.108
@@ -26,6 +26,7 @@
 Patch0: gtk+-2.4.1-lib64.patch
 # Backported from 2.10
 Patch1: gtk+-2.8.6-inputmethod.patch
+Patch2: gtk+-2.8.10-abicheck.pach
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -88,6 +89,7 @@
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .inputmethod
+%patch2 -p1 -b .abicheck
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .