Thu Dec 11 09:54:42 UTC 2008

Author: kasal

Update of /cvs/extras/rpms/gawk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10047

Modified Files:
	.cvsignore gawk-3.1.5-test-lc_num1.patch gawk.spec sources 
Removed Files:
	gawk-3.1.3-getpgrp_void.patch gawk-3.1.5-binmode.patch 
	gawk-3.1.5-fieldwidths.patch gawk-3.1.5-free.patch 
	gawk-3.1.5-freewstr.patch gawk-3.1.5-internal.patch 
	gawk-3.1.5-ipv6.patch gawk-3.1.5-mbread.patch 
	gawk-3.1.5-num2str.patch gawk-3.1.5-numflags.patch 
	gawk-3.1.5-quote-sticky.patch gawk-3.1.5-syntaxerror.patch 
	gawk-3.1.5-wconcat.patch 
Log Message:
sync with devel, ver. 3.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gawk/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11

--- .cvsignore	20 Sep 2005 12:12:48 -0000	1.10
+++ .cvsignore	11 Dec 2008 09:54:11 -0000	1.11
@@ -1,2 +1 @@
-gawk-3.1.5-ps.tar.gz
-gawk-3.1.5.tar.bz2
+gawk-3.1.6.tar.bz2

gawk-3.1.5-test-lc_num1.patch:

Index: gawk-3.1.5-test-lc_num1.patch
===================================================================
RCS file: /cvs/extras/rpms/gawk/F-10/gawk-3.1.5-test-lc_num1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gawk-3.1.5-test-lc_num1.patch	31 Oct 2007 16:13:03 -0000	1.1
+++ gawk-3.1.5-test-lc_num1.patch	11 Dec 2008 09:54:11 -0000	1.2
@@ -1,6 +1,6 @@
 --- test/Makefile.am.ulitest	2005-07-26 20:07:43.000000000 +0200
 +++ test/Makefile.am	2007-09-27 10:48:51.000000000 +0200
-@@ -273,6 +273,8 @@
+@@ -300,6 +300,8 @@
  	intprec.ok \
  	iobug1.awk \
  	iobug1.ok \
@@ -9,16 +9,16 @@
  	leaddig.awk \
  	leaddig.ok \
  	leadnl.awk \
-@@ -588,7 +590,7 @@
+@@ -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 \
+ 	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 nasty nasty2 negexp nested nfldstr \
- 	nfneg nfset nlfldsep nlinstr nlstrina noeffect nofmtch noloop1 \
+ 	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 \
-@@ -678,6 +680,12 @@
+@@ -755,6 +757,12 @@
  extend-msg-end:
  	@echo "======== Done with gawk extension tests ========"
  
@@ -44,7 +44,7 @@
 +}
 --- test/Gentests.ulitest	2005-05-11 17:28:17.000000000 +0200
 +++ test/Gentests	2007-09-27 10:47:26.000000000 +0200
-@@ -36,7 +36,7 @@
+@@ -45,7 +45,7 @@
  	next
  }
  


Index: gawk.spec
===================================================================
RCS file: /cvs/extras/rpms/gawk/F-10/gawk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gawk.spec	21 Jul 2008 15:04:20 -0000	1.53
+++ gawk.spec	11 Dec 2008 09:54:11 -0000	1.54
@@ -1,44 +1,22 @@
 Summary: The GNU version of the awk text processing utility
 Name: gawk
-Version: 3.1.5
-Release: 18%{?dist}
+Version: 3.1.6
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Text
 URL: http://www.gnu.org/software/gawk/gawk.html
-Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: /bin/mktemp
 
-# needed for gawk-3.1.5-syntaxerror.patch:
-BuildRequires: bison
-# Seems currently unused:
-#BuildRequires: flex
-# for patch14:
+# for patch14
 BuildRequires: autoconf automake
 
-Patch1: gawk-3.1.3-getpgrp_void.patch
-Patch2: gawk-3.1.5-free.patch
-Patch3: gawk-3.1.5-fieldwidths.patch
-Patch4: gawk-3.1.5-binmode.patch
-Patch5: gawk-3.1.5-num2str.patch
-Patch6: gawk-3.1.5-wconcat.patch
-#  fix internal names like /dev/user, /dev/pid, as well as /dev/fd/N
-Patch7: gawk-3.1.5-internal.patch
-# 194214 - gawk coredumps on syntax error
-Patch8: gawk-3.1.5-syntaxerror.patch
-# http://lists.gnu.org/archive/html/bug-gnu-utils/2006-07/msg00004.html
-Patch9: gawk-3.1.5-numflags.patch
-# IPv6 support
-Patch10: gawk-3.1.5-ipv6.patch
-# 222080 - double free or corruption
-Patch11: gawk-3.1.5-freewstr.patch
-# upstream patch - Invalid read of size 4
-Patch12: gawk-3.1.5-mbread.patch
-# bug #299551 - quote flag is sticky
-Patch13: gawk-3.1.5-quote-sticky.patch
+# 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
 
 %description
@@ -51,19 +29,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .getpgrp_void
-%patch2 -p1 -b .free
-%patch3 -p1 -b .fieldwidths
-%patch4 -p1 -b .binmode
-%patch5 -p1 -b .num2str
-%patch6 -p1 -b .wconcat
-%patch7 -p1 -b .internal
-%patch8 -p1 -b .syntaxerror
-%patch9 -p1 -b .numflag
-%patch10 -p1 -b .ipv6
-%patch11 -p1 -b .freewstr
-%patch12 -p1 -b .mbread
-%patch13 -p0 -b .uli
 %patch14 -p0 -b .ulitest
 
 %build
@@ -83,11 +48,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
-rm -f $RPM_BUILD_ROOT/bin/{,p}gawk-%{version}
-# FIXME: enable this at a suitable point of time:
-#mv $RPM_BUILD_ROOT/bin/{p,i}gawk $RPM_BUILD_ROOT%{_bindir}
-
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+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
 
 %find_lang %name
 
@@ -117,6 +79,15 @@
 %{_datadir}/awk
 
 %changelog
+* Wed Nov 26 2008 Stepan Kasal <skasal at redhat.com> - 3.1.6-2
+- test-lc_num1.patch submitted upstream, link added
+
+* Tue Nov 25 2008 Stepan Kasal <skasal at redhat.com> - 3.1.6-1
+- new upstream version
+- drop Patch1: gawk-3.1.3-getpgrp_void.patch, it seems to be a workaround
+  for a bug in gcc that seemed to exist at Fedora Core 1 times, see #114246
+- drop patches 2-13, they have been integrated upstream
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.5-18
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gawk/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Sep 2005 12:12:48 -0000	1.10
+++ sources	11 Dec 2008 09:54:11 -0000	1.11
@@ -1,2 +1 @@
-5e260a21e93a29ff9066c39850ece860  gawk-3.1.5-ps.tar.gz
-5703f72d0eea1d463f735aad8222655f  gawk-3.1.5.tar.bz2
+c9926c0bc8c177cb9579708ce67f0d75  gawk-3.1.6.tar.bz2


--- gawk-3.1.3-getpgrp_void.patch DELETED ---


--- gawk-3.1.5-binmode.patch DELETED ---


--- gawk-3.1.5-fieldwidths.patch DELETED ---


--- gawk-3.1.5-free.patch DELETED ---


--- gawk-3.1.5-freewstr.patch DELETED ---


--- gawk-3.1.5-internal.patch DELETED ---


--- gawk-3.1.5-ipv6.patch DELETED ---


--- gawk-3.1.5-mbread.patch DELETED ---


--- gawk-3.1.5-num2str.patch DELETED ---


--- gawk-3.1.5-numflags.patch DELETED ---


--- gawk-3.1.5-quote-sticky.patch DELETED ---


--- gawk-3.1.5-syntaxerror.patch DELETED ---


--- gawk-3.1.5-wconcat.patch DELETED ---


