- removed broken ac patch, proper fix: added -I m4 to autoconf (not aclocal)

- fixed info patch

Changed files:
    gawk-ac.patch -> 1.3
    gawk-info.patch -> 1.7
    gawk.spec -> 1.64

diff --git a/gawk-ac.patch b/gawk-ac.patch
deleted file mode 100644 (file)
index 5af5797..0000000
--- a/gawk-ac.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru gawk-3.1.2.orig/Makefile.am gawk-3.1.2/Makefile.am
---- gawk-3.1.2.orig/Makefile.am        Thu Mar  6 10:31:38 2003
-+++ gawk-3.1.2/Makefile.am     Fri Apr  4 13:00:43 2003
-@@ -112,7 +112,7 @@
- pgawk_SOURCES = $(base_sources) eval_p.c profile_p.c
- 
- # Get extra libs as needed
--LDADD = @LIBINTL@ @SOCKET_LIBS@
-+LDADD = @LIBINTL@
- 
- # Set autoconf Makefile.in variables correctly
- datadir = @datadir@
-diff -Nru gawk-3.1.2.orig/configure.in gawk-3.1.2/configure.in
---- gawk-3.1.2.orig/configure.in       Sun Mar 16 11:23:32 2003
-+++ gawk-3.1.2/configure.in    Fri Apr  4 13:01:47 2003
-@@ -23,6 +23,12 @@
- 
- dnl Process this file with autoconf to produce a configure script.
- 
-+m4_pattern_allow(GAWK_AC_LINUX_ALPHA)
-+m4_pattern_allow(GAWK_AC_TYPE_SSIZE_T)
-+m4_pattern_allow(GAWK_AC_FUNC_STRTOD_C89)
-+m4_pattern_allow(GAWK_AC_LIB_SOCKETS)
-+m4_pattern_allow(GAWK_AC_AIX_TWEAK)
-+
- dnl *** IMPORTANT ***: Fix version in both AC_INIT and AM_INIT_AUTOMAKE
- AC_INIT([GNU Awk], 3.1.2, bug-gawk@gnu.org, gawk)
- 

diff --git a/gawk-info.patch b/gawk-info.patch
index ff9fd73613f823f3a61d66f527359c695c3b2fe9..6dcb72f911afa922d774af1adb1dc84423b41bc1 100644 (file)
--- a/gawk-info.patch
+++ b/gawk-info.patch
@@ -13,7 +13,7 @@ diff -Nru gawk-3.1.2.orig/doc/gawk.texi gawk-3.1.2/doc/gawk.texi
 -@dircategory Individual utilities
 -@direntry
 -* awk: (gawk)Invoking gawk.                     Text scanning and processing.
-+* Gawk: (gawk).                                      A text scanning and processing language.
++* Gawk: (gawk).                               A text scanning and processing language
  @end direntry
  
  @c @set xref-automatic-section-title
@@ -28,7 +28,7 @@ diff -Nru gawk-3.1.2.orig/doc/gawkinet.texi gawk-3.1.2/doc/gawkinet.texi
 +@dircategory Programming Languages:
  @direntry
 -* Gawkinet: (gawkinet).         TCP/IP Internetworking With `gawk'.
-+* Gawkinet: (gawkinet).                             TCP/IP Internetworking With `gawk'.
++* Gawkinet: (gawkinet).                       TCP/IP Internetworking With `gawk'
  @end direntry
  
  @iftex

diff --git a/gawk.spec b/gawk.spec
index 4015c494c7eba3ba72458313e4eb30854cce664f..e53c418a56c1a97f42926e8826af43b33199e4af 100644 (file)
--- a/gawk.spec
+++ b/gawk.spec
@@ -18,10 +18,11 @@ Source1:    http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-shutup.patch
 Patch2:                %{name}-pmake.patch
-Patch3:                %{name}-ac.patch
+BuildRequires: autoconf >= 2.57
+BuildRequires: automake >= 1.7
+BuildRequires: texinfo
 Requires:      mktemp
 Requires:      sed
-BuildRequires: texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gawk-doc
 
@@ -100,11 +101,10 @@ Ara
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__aclocal}
-%{__autoconf}
+%{__autoconf} -I m4
 %{__autoheader}
 %{__automake}
 %configure \