From aa150643ce75a1388eefd710a43f74f5cbb54d7f Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Dec 13 2004 12:04:36 +0000
Subject: Fix build for FC3 (still unstable/fragile though).


---

diff --git a/abicheck-1.2-fc3.patch b/abicheck-1.2-fc3.patch
new file mode 100644
index 0000000..e376064
--- /dev/null
+++ b/abicheck-1.2-fc3.patch
@@ -0,0 +1,12 @@
+diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl
+--- abicheck-1.2-orig/abicheck.pl	2003-08-26 21:57:51.000000000 +0200
++++ abicheck-1.2/abicheck.pl	2004-12-13 13:00:40.321321296 +0100
+@@ -1592,7 +1592,7 @@
+ 		$dtneeded_match =
+ 		    q/^\s*(\S+)\s+=>\s+(not found|\S+)/;
+ 		$file_match =
+-		    q/^(\s*\d+:).*needed by (.*)$/;
++		    q/^(\s*\d+:).*needed by (.*) (\[\d+\])*$/;
+ 		#
+ 		# n.b. there is a PID mismatch in the GNU linker output if
+ 		# we watch for the more sensible:
diff --git a/abicheck-1.2-test-static.patch b/abicheck-1.2-test-static.patch
new file mode 100644
index 0000000..b025762
--- /dev/null
+++ b/abicheck-1.2-test-static.patch
@@ -0,0 +1,12 @@
+diff -Nur abicheck-1.2-orig/test/Makefile abicheck-1.2/test/Makefile
+--- abicheck-1.2-orig/test/Makefile	2003-08-26 21:57:51.000000000 +0200
++++ abicheck-1.2/test/Makefile	2004-12-13 13:01:19.827315472 +0100
+@@ -9,7 +9,7 @@
+ # /usr/bin/ld: BFD 2.11.93.0.2 20020207 assertion fail elf-strtab.c:262
+ # but it still creates the binary properly.
+ libc_a: libc_a.c
+-	cc -o libc_a libc_a.c -lm /usr/lib/libc.a
++	cc -o libc_a libc_a.c -static -lm /usr/lib/libc.a
+ 
+ private1: private1.c
+ 	cc -D`uname` -o private1 private1.c
diff --git a/abicheck.spec b/abicheck.spec
index ee34bfc..4b8d835 100644
--- a/abicheck.spec
+++ b/abicheck.spec
@@ -1,12 +1,13 @@
-Summary: 	an ABI checking tool
+Summary: 	ABI checking tool
 Name: 		abicheck
 Version: 	1.2
-Release: 	2
-Epoch: 		0
+Release: 	3
 License: 	LGPL
 Group: 		Applications/File
 URL: 		http://abicheck.sourceforge.net/
 Source0: 	%{name}-%{version}.tar.gz
+Patch:		abicheck-1.2-fc3.patch
+Patch1:		abicheck-1.2-test-static.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:	binutils perl
 
@@ -21,6 +22,8 @@ Binary Interface).
 
 %prep
 %setup -q
+%patch -p1 -b .fc3
+%patch1 -p1 -b .test-static
 
 # -----------------------------------------------------------------------------
 
@@ -52,6 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Dec 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2-3
+- Add patch to catch up with changes in ldd output.
+- Fix static linking test.
+- Drop Epoch 0.
+
 * Wed Aug 27 2003 Dams <anvil[AT]livna.org> 0:1.2-0.fdr.2
 - Added missing Requires