dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: abicheck
-# $Id: Makefile,v 1.1 2004/11/08 04:00:14 cvsextras Exp $
-NAME := abicheck
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

abicheck-1.2-test-static.patch

@@ -1,12 +0,0 @@
-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

abicheck-1.2-tests.patch

@@ -0,0 +1,70 @@
+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 -Nur abicheck-1.2-orig/test/libc_a.c abicheck-1.2/test/libc_a.c
+--- abicheck-1.2-orig/test/libc_a.c	2003-08-26 21:57:51.000000000 +0200
++++ abicheck-1.2/test/libc_a.c	2007-05-24 11:11:20.000000000 +0200
+@@ -5,6 +5,7 @@
+ 
+ /* This is used to catch libc.a linking. See Makefile & run_tests */
+ 
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+ 
+diff -Nur abicheck-1.2-orig/test/private1.c abicheck-1.2/test/private1.c
+--- abicheck-1.2-orig/test/private1.c	2002-06-18 20:16:07.000000000 +0200
++++ abicheck-1.2/test/private1.c	2007-05-24 11:40:25.000000000 +0200
+@@ -6,6 +6,7 @@
+ /* This is for simple catching of some private symbol usage. See run_tests */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #if	defined(SunOS)
+ #define OS "Solaris"
+diff -Nur abicheck-1.2-orig/test/run_tests abicheck-1.2/test/run_tests
+--- abicheck-1.2-orig/test/run_tests	2002-02-07 15:40:20.000000000 +0100
++++ abicheck-1.2/test/run_tests	2007-05-24 11:40:52.000000000 +0200
+@@ -19,7 +19,7 @@
+ # libc_a:
+ 
+ name="libc.a static link test on libc_a"
+-if abicheck ./libc_a 2>/dev/null | grep 'STATIC_LINK:.*libc' > /dev/null; then
++if abicheck ./libc_a 2>/dev/null | grep 'STATIC_LINK:.*\(libc\|completely statically linked\)' > /dev/null; then
+ 	pass
+ else
+ 	fail
+diff -Nur abicheck-1.2-orig/test/run_tests abicheck-1.2/test/run_tests
+--- abicheck-1.2-orig/test/run_tests	2002-02-07 15:40:20.000000000 +0100
++++ abicheck-1.2/test/run_tests	2007-05-24 12:33:02.000000000 +0200
+@@ -39,7 +39,7 @@
+ # private1:
+ 
+ name="private1: calls private sym in libc"
+-if abicheck ./private1 2>/dev/null | egrep 'PRIVATE:.*libc.*(__open|__nanosleep)' > /dev/null; then
++if abicheck ./private1 2>/dev/null | grep 'PRIVATE:.*libc.*\(__open\|__nanosleep\)' > /dev/null; then
+ 	pass
+ else
+ 	fail
+diff -Nur abicheck-1.2-orig/test/run_tests abicheck-1.2/test/run_tests
+--- abicheck-1.2-orig/test/run_tests	2002-02-07 15:40:20.000000000 +0100
++++ abicheck-1.2/test/run_tests	2007-05-24 13:00:58.000000000 +0200
+@@ -29,7 +29,7 @@
+ # public1:
+ 
+ name="public1: only calls public syms"
+-if [ "`abicheck ./public1 2>/dev/null`" = "./public1: OK" ]; then
++if [ "`abicheck ./public1 2>/dev/null`" == "./public1: OK" ]; then
+ 	pass
+ else
+ 	fail

abicheck.spec

@@ -3,13 +3,13 @@
 Summary: 	ABI checking tool
 Name: 		abicheck
 Version: 	1.2
-Release: 	11
+Release: 	11.6
-License: 	LGPL
+License: 	LGPLv2
 Group: 		Applications/File
 URL: 		http://abicheck.sourceforge.net/
 Source0: 	http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz
 Patch0:		abicheck-1.2-fc3.patch
-Patch1:		abicheck-1.2-test-static.patch
+Patch1:		abicheck-1.2-tests.patch
 Patch2:		abicheck-1.2-bindings-fc4.patch
 Patch3:		abicheck-1.2-libgcc.patch
 Patch4:		abicheck-1.2-fortify-source-fc6.patch
@@ -27,7 +27,7 @@ Binary Interface).
 %prep
 %setup -q
 %patch -p1 -b .fc3
-%patch1 -p1 -b .test-static
+%patch1 -p1 -b .tests
 %patch2 -p1 -b .bindings-fc4
 %patch3 -p1 -b .libgcc
 %patch4 -p1 -b .fortify-source-fc5
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  5 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2-11.6
+- Sync with rawhide: clarify licence (LGPLv2), update tests patch
+
 * Mon Aug 28 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2-11
 - Rebuild and update fortify-source patch.