- removed ac-workaround patch, fixed ac-ac patch

- release 26

Changed files:
    mawk-ac-ac.patch -> 1.2
    mawk-ac-workaround.patch -> 1.2
    mawk.spec -> 1.42

diff --git a/mawk-ac-ac.patch b/mawk-ac-ac.patch
index 32f0f1e31702d1b7a83ab54f9aa40558fb54f3ba..b1747e590f33510f60f09c4dfad27b2729d5e08f 100644 (file)
--- a/mawk-ac-ac.patch
+++ b/mawk-ac-ac.patch
@@ -6,8 +6,8 @@
  WHERE_SIZE_T
 -CHECK_HEADERS(fcntl.h,errno.h, time.h,stdarg.h)
 -CHECK_FUNCTIONS(memcpy,strchr,strerror,vfprintf,strtod,fmod,matherr)
-+AC_CHECK_HEADERS(fcntl.h,errno.h, time.h,stdarg.h)
-+AC_CHECK_FUNCS(memcpy,strchr,strerror,vfprintf,strtod,fmod,matherr)
++AC_CHECK_HEADERS(fcntl.h errno.h time.h stdarg.h)
++AC_CHECK_FUNCS(memcpy strchr strerror vfprintf strtod fmod matherr)
  FPRINTF_IN_STDIO
  FIND_OR_COMPUTE_MAX__INT
  DREADED_FPE_TESTS

diff --git a/mawk-ac-workaround.patch b/mawk-ac-workaround.patch
deleted file mode 100644 (file)
index 026b828..0000000
--- a/mawk-ac-workaround.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- mawk-1.3.3.orig/configure.in       Mon Oct 16 13:25:00 1995
-+++ mawk-1.3.3/configure.in    Sun Nov 11 14:42:20 2001
-@@ -41,7 +41,13 @@
- COMPILER_ATTRIBUTES
- WHERE_SIZE_T
- CHECK_HEADERS(fcntl.h,errno.h, time.h,stdarg.h)
--CHECK_FUNCTIONS(memcpy,strchr,strerror,vfprintf,strtod,fmod,matherr)
-+CHECK_FUNCTIONS(memcpy)
-+CHECK_FUNCTIONS(strchr)
-+CHECK_FUNCTIONS(strerror)
-+CHECK_FUNCTIONS(vfprintf)
-+CHECK_FUNCTIONS(strtod)
-+CHECK_FUNCTIONS(fmod)
-+CHECK_FUNCTIONS(matherr)
- FPRINTF_IN_STDIO
- FIND_OR_COMPUTE_MAX__INT
- DREADED_FPE_TESTS

diff --git a/mawk.spec b/mawk.spec
index e3536d21417ac907d23269aa801726c71d45a5c9..3ac15957bc522c252be560e893c0074b6a11fab4 100644 (file)
--- a/mawk.spec
+++ b/mawk.spec
@@ -9,18 +9,18 @@ Summary(tr):  Posix AWK Yorumlay
 Summary(uk):   ¶ÎÔÅÒÐÒÅÔÁÔÏÒ ÍÏ×É ÐÒÏÇÒÁÍÕ×ÁÎÎÑ awk
 Name:          mawk
 Version:       1.3.3
-Release:       25
+Release:       26
 License:       GPL
 Group:         Applications/Text
 Source0:       ftp://ftp.whidbey.net/pub/brennan/%{name}%{version}.tar.gz
 Source1:       %{name}.1.pl
 Patch0:                %{name}-fix_%{name}_path.patch
-Patch1:                %{name}-ac-workaround.patch
-Patch2:                %{name}-ac-ac.patch
-Provides:      /bin/awk
-Provides:      awk
+Patch1:                %{name}-ac-ac.patch
 BuildRequires: autoconf
+BuildRequires: automake
 %{?BOOT:BuildRequires: glibc-static}
+Provides:      /bin/awk
+Provides:      awk
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _exec_prefix    /
@@ -94,8 +94,7 @@ Wersja awka na bootkietk
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
-%patch2 -p1
+%patch1 -p1
 
 %build
 autoupdate mawk.ac.m4