dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-gawk-3.1.6.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+gawk-3.1.6.tar.bz2
+libsigsegv-2.6.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: gawk
-# $Id: Makefile,v 1.1 2004/09/09 04:57:13 cvsdist Exp $
-NAME := gawk
-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),)
-# attempt 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)

gawk-3.1.5-test-lc_num1.patch

@@ -1,55 +0,0 @@
---- test/Makefile.am.ulitest	2005-07-26 20:07:43.000000000 +0200
-+++ test/Makefile.am	2007-09-27 10:48:51.000000000 +0200
-@@ -300,6 +300,8 @@
- 	intprec.ok \
- 	iobug1.awk \
- 	iobug1.ok \
-+	lc_num1.awk \
-+	lc_num1.ok \
- 	leaddig.awk \
- 	leaddig.ok \
- 	leadnl.awk \
-@@ -658,7 +660,7 @@
- 	fordel forsimp fsbs fsspcoln fsrs fstabplus funsemnl funsmnam funstack getline \
- 	getline2 getline3 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest \
- 	gsubtst2 gsubtst3 gsubtst4 gsubtst5 hex hsprint inputred intest intformat \
--	intprec iobug1 leaddig leadnl litoct longsub longwrds manglprm math membug1 \
-+	intprec iobug1 lc_num1 leaddig leadnl litoct longsub longwrds manglprm math membug1 \
- 	messages minusstr mmap8k mtchi18n nasty nasty2 negexp nested nfldstr \
- 	nfneg nfset nlfldsep nlinstr nlstrina noeffect nofile nofmtch noloop1 \
- 	noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt \
-@@ -755,6 +757,12 @@
- extend-msg-end:
- 	@echo "======== Done with gawk extension tests ========"
- 
-+lc_num1:
-+	@echo $@
-+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-+	AWKPATH=$(srcdir) $(AWK) --posix -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
-+
- 
- # This test is a PITA because increasingly, /tmp is getting
- # mounted noexec.  So, we'll test it locally.  Sigh.
---- /dev/null	1970-01-01 00:00:00 +0000
-+++ test/lc_num1.ok	2007-09-27 10:47:26.000000000 +0200
-@@ -0,0 +1 @@
-+1,000,000 1000000
---- /dev/null	1970-01-01 00:00:00 +0000
-+++ test/lc_num1.awk	2007-09-27 10:47:26.000000000 +0200
-@@ -0,0 +1,4 @@
-+# Bug reported by Ulrich Drepper.
-+BEGIN {
-+  printf("%'d %d\n", 1000000, 1000000)
-+}
---- test/Gentests.ulitest	2005-05-11 17:28:17.000000000 +0200
-+++ test/Gentests	2007-09-27 10:47:26.000000000 +0200
-@@ -45,7 +45,7 @@
- 	next
- }
- 
--/^[a-zA-Z][a-zA-Z0-9]*:/ {
-+/^[a-zA-Z_][a-zA-Z0-9_]*:/ {
- 	# remember all targets from Makefile.am
- 	sub(/:.*/,"")
- 	targets[$0]

gawk.spec

@@ -1,23 +1,21 @@
 Summary: The GNU version of the awk text processing utility
 Name: gawk
 Version: 3.1.6
-Release: 2%{?dist}
-License: GPLv2+
+Release: 5%{?dist}
+License: GPLv3+
 Group: Applications/Text
 URL: http://www.gnu.org/software/gawk/gawk.html
 Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
+Source1: http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.6.tar.gz
+Patch0: gawk-stable-tree.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: /bin/mktemp
 
-# for patch14
-BuildRequires: autoconf automake
-
-# test for #299551, submitted:
-# http://lists.gnu.org/archive/html/bug-gnu-utils/2008-11/msg00044.html
-Patch14: gawk-3.1.5-test-lc_num1.patch
+# patching the sources for these tools
+BuildRequires: autoconf automake gettext-devel texinfo bison
 
 %description
 The gawk package contains the GNU version of awk, a text processing
@@ -28,11 +26,15 @@ Install the gawk package if you need a text processing utility. Gawk is
 considered to be a standard Linux tool for processing text.
 
 %prep
-%setup -q
-%patch14 -p0 -b .ulitest
+%setup -q -a 1
+mv libsigsegv-2.6 libsigsegv
+# do not install with gawk
+echo 'install:'  >>libsigsegv/Makefile.am
+%patch0 -p1
+# we have patched the sources for these:
+rm awkgram.c doc/*.info
 
 %build
-# for patch14:
 autoreconf
 %configure --bindir=/bin
 make %{?_smp_mflags}
@@ -49,7 +51,8 @@ ln -sf gawk.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/awk.1.gz
 ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/awk
 ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/gawk
 mv $RPM_BUILD_ROOT/bin/{p,i}gawk $RPM_BUILD_ROOT%{_bindir}
-rm -f $RPM_BUILD_ROOT/bin/{,p}gawk-%{version} $RPM_BUILD_ROOT%{_infodir}/dir
+# remove %{version}* , when we are building a snapshot...
+rm -f $RPM_BUILD_ROOT/bin/{,p}gawk-%{version}* $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %name
 
@@ -70,8 +73,8 @@ fi
 %defattr(-,root,root,-)
 %doc README COPYING FUTURES LIMITATIONS NEWS
 %doc README_d/README.multibyte README_d/README.tests POSIX.STD
-/bin/*
-%{_bindir}/*
+/bin/*awk
+%{_bindir}/*awk
 %{_mandir}/man1/*
 %{_infodir}/gawk.info*
 %{_infodir}/gawkinet.info*
@@ -79,6 +82,18 @@ fi
 %{_datadir}/awk
 
 %changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan 30 2009 Stepan Kasal <skasal@redhat.com> - 3.1.6-4
+- remove the versioned binaries even if the version is modified by the
+  snapshot patch, modify the file list to check this (#476166)
+- update the snapshot patch, dropping the upstreamed
+  gawk-3.1.5-test-lc_num1.patch
+
+* Thu Dec 11 2008 Stepan Kasal <skasal@redhat.com> - 3.1.6-3
+- grab the current stable tree from savannah
+
 * Wed Nov 26 2008 Stepan Kasal <skasal@redhat.com> - 3.1.6-2
 - test-lc_num1.patch submitted upstream, link added
 

sources

@@ -1 +1,2 @@
 c9926c0bc8c177cb9579708ce67f0d75  gawk-3.1.6.tar.bz2
+7e24993730649d13c6eabc28bd24de35  libsigsegv-2.6.tar.gz