rpms/abicheck/devel abicheck-1.2-fc3.patch, NONE, 1.1 abicheck-1.2-test-static.patch, NONE, 1.1 abicheck.spec, 1.5, 1.6

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/abicheck/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11598

Modified Files:
	abicheck.spec 
Added Files:
	abicheck-1.2-fc3.patch abicheck-1.2-test-static.patch 
Log Message:
Fix build for FC3 (still unstable/fragile though).

abicheck-1.2-fc3.patch:

--- NEW FILE abicheck-1.2-fc3.patch ---
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:

abicheck-1.2-test-static.patch:

--- NEW FILE abicheck-1.2-test-static.patch ---
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


Index: abicheck.spec
===================================================================
RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- abicheck.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ abicheck.spec	13 Dec 2004 12:04:36 -0000	1.6
@@ -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 @@
 
 %prep
 %setup -q
+%patch -p1 -b .fc3
+%patch1 -p1 -b .test-static
 
 # -----------------------------------------------------------------------------
 
@@ -52,6 +55,11 @@
 # -----------------------------------------------------------------------------
 
 %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