Accepting request 175250 from home:namtrac:branches:Base:System

- Update to version 4.1.0
  * The three executables gawk, pgawk, and dgawk, have been merged into
    one, named just gawk.
  * The new -i option (from xgawk) is used for loading awk library files.
  * The new -l option (from xgawk) is used for loading dynamic extensions.
  * The dynamic extension interface has been completely redone.  There is
    now a defined API for C extensions to use.  A C extension acts like
    a function written in awk, except that it cannot do everything that awk
    code can. However, this allows interfacing to any facility that is
    available from C.
  * The "inplace" extension, built using the new facility, can be used to
    simulate the GNU "sed -i" feature.
  * The and(), or() and xor() functions now take any number of arguments,
    with a minimum of two.
  * New arrays: SYMTAB, FUNCTAB, and PROCINFO["identifiers"]. SYMTAB allows
    indirect access to any defined variable or array; it is possible to
    "walk" the symbol table, if that should be necessary.
- Refreshed gawk-3.1.8.diff
- Add older-automake.diff to support automake 1.12

OBS-URL: https://build.opensuse.org/request/show/175250
OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=33

gawk-3.1.8.diff

@@ -1,6 +1,7 @@
-diff -aur gawk-4.0.1.orig/builtin.c gawk-4.0.1/builtin.c
+Index: gawk-4.1.0/builtin.c
---- gawk-4.0.1.orig/builtin.c	2012-03-28 15:54:55.000000000 -0400
+===================================================================
-+++ gawk-4.0.1/builtin.c	2012-04-03 21:03:30.156093525 -0400
+--- gawk-4.1.0.orig/builtin.c
++++ gawk-4.1.0/builtin.c
 @@ -29,7 +29,6 @@
  #include <fcntl.h>
  #endif
@@ -22,10 +23,11 @@ diff -aur gawk-4.0.1.orig/builtin.c gawk-4.0.1/builtin.c
  extern NODE **args_array;
  extern int max_args;
  extern NODE **fields_arr;
-diff -aur gawk-4.0.1.orig/doc/gawk.texi gawk-4.0.1/doc/gawk.texi
+Index: gawk-4.1.0/doc/gawk.texi
---- gawk-4.0.1.orig/doc/gawk.texi	2012-03-28 15:47:54.000000000 -0400
+===================================================================
-+++ gawk-4.0.1/doc/gawk.texi	2012-04-03 21:02:52.242567511 -0400
+--- gawk-4.1.0.orig/doc/gawk.texi
-@@ -1511,7 +1511,7 @@
++++ gawk-4.1.0/doc/gawk.texi
+@@ -1718,7 +1718,7 @@ and
  Chuck Toporek.
  
  @cindex Berry, Karl
@@ -34,7 +36,7 @@ diff -aur gawk-4.0.1.orig/doc/gawk.texi gawk-4.0.1/doc/gawk.texi
  @c @cindex Texinfo
  Robert J.@: Chassell provided much valuable advice on
  the use of Texinfo.
-@@ -27272,7 +27272,7 @@
+@@ -33767,7 +33767,7 @@ did the initial work to convert @command
  GNU Automake and GNU @code{gettext}.
  
  @item
@@ -43,12 +45,13 @@ diff -aur gawk-4.0.1.orig/doc/gawk.texi gawk-4.0.1/doc/gawk.texi
  Alan J.@: Broder
  provided the initial version of the @code{asort()} function
  as well as the code for the optional third argument to the
-diff -aur gawk-4.0.1.orig/Makefile.am gawk-4.0.1/Makefile.am
+Index: gawk-4.1.0/Makefile.am
---- gawk-4.0.1.orig/Makefile.am	2012-03-28 15:47:53.000000000 -0400
+===================================================================
-+++ gawk-4.0.1/Makefile.am	2012-04-03 21:03:52.165818367 -0400
+--- gawk-4.1.0.orig/Makefile.am
-@@ -106,11 +106,7 @@
++++ gawk-4.1.0/Makefile.am
- 	msg.c \
+@@ -115,11 +115,7 @@ base_sources = \
  	node.c \
+ 	profile.c \
  	protos.h \
 -	random.c \
 -	random.h \
@@ -56,5 +59,17 @@ diff -aur gawk-4.0.1.orig/Makefile.am gawk-4.0.1/Makefile.am
 -	regex.c \
 -	regex.h \
  	replace.c \
- 	version.c \
+ 	str_array.c \
- 	xalloc.h
+ 	symbol.c \
+Index: gawk-4.1.0/po/POTFILES.in
+===================================================================
+--- gawk-4.1.0.orig/po/POTFILES.in
++++ gawk-4.1.0/po/POTFILES.in
+@@ -36,7 +36,6 @@ profile.c
+ random.c
+ re.c
+ regcomp.c
+-regex.c
+ regex_internal.c
+ regexec.c
+ replace.c

gawk-4.0.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:476dee8bea8bc3b04af5cae502b83ea16edd5b703d20418918f8773889d78c80
-size 2680974

gawk-4.1.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79f81b09bc3cce50e083f78acc0f91783821ad30866615d30dd1731f17ec440b
+size 3995528

gawk.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon May 13 09:35:02 UTC 2013 - idonmez@suse.com
+
+- Update to version 4.1.0
+  * The three executables gawk, pgawk, and dgawk, have been merged into
+    one, named just gawk.
+  * The new -i option (from xgawk) is used for loading awk library files.
+  * The new -l option (from xgawk) is used for loading dynamic extensions.
+  * The dynamic extension interface has been completely redone.  There is
+    now a defined API for C extensions to use.  A C extension acts like
+    a function written in awk, except that it cannot do everything that awk
+    code can. However, this allows interfacing to any facility that is
+    available from C.
+  * The "inplace" extension, built using the new facility, can be used to
+    simulate the GNU "sed -i" feature.
+  * The and(), or() and xor() functions now take any number of arguments,
+    with a minimum of two.
+  * New arrays: SYMTAB, FUNCTAB, and PROCINFO["identifiers"]. SYMTAB allows
+    indirect access to any defined variable or array; it is possible to
+    "walk" the symbol table, if that should be necessary.
+- Refreshed gawk-3.1.8.diff
+- Add older-automake.diff to support automake 1.12
+
 -------------------------------------------------------------------
 Tue Mar 26 14:25:52 UTC 2013 - mmeister@suse.com
 

gawk.spec

@@ -20,12 +20,13 @@ Name:           gawk
 Url:            http://www.gnu.org/software/gawk/
 Provides:       awk
 BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  update-alternatives
 %if 0%{suse_version} > 1220
 BuildRequires:  makeinfo
 %endif
 PreReq:         %{install_info_prereq} update-alternatives
-Version:        4.0.1
+Version:        4.1.0
 Release:        0
 Summary:        GNU awk
 License:        GPL-3.0+
@@ -33,6 +34,7 @@ Group:          Productivity/Text/Utilities
 Source:         http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:        gawk-4.0.0h.de.po.bz2
 Patch1:         gawk-3.1.8.diff
+Patch2:         older-automake.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -42,9 +44,12 @@ almost completely POSIX 1003.2 compliant.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
+
 bunzip2 -c %{S:1} > po/de.po
 rm -f regex.[ch]
 chmod -x COPYING
+
 # force rebuild with non-broken makeinfo
 rm -f doc/*.info
 
@@ -66,12 +71,14 @@ make check
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+
 #UsrMerge
 install -d $RPM_BUILD_ROOT/bin
 ln -sf %{_bindir}/gawk $RPM_BUILD_ROOT/bin
 touch $RPM_BUILD_ROOT/bin/awk
 #EndUsrMerge
 rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} $RPM_BUILD_ROOT/usr/bin/awk
+
 # create ghost files
 touch $RPM_BUILD_ROOT/%{_bindir}/awk $RPM_BUILD_ROOT/%{_mandir}/man1/awk.1.gz
 %find_lang %name
@@ -101,19 +108,19 @@ fi
 %ghost %{_bindir}/awk
 %ghost %{_mandir}/man1/awk.1.gz
 %endif
-%doc AUTHORS COPYING FUTURES LIMITATIONS NEWS POSIX.STD PROBLEMS README
+%doc AUTHORS COPYING NEWS POSIX.STD README
 #UsrMerge
 /bin/gawk
 #EndUsrMerge
-%{_bindir}/dgawk
 %{_bindir}/gawk
 %{_bindir}/igawk
-%{_bindir}/pgawk
 %{_libdir}/awk
-/usr/share/awk
+%{_libdir}/gawk
+%{_datadir}/awk
+%{_includedir}/gawkapi.h
 %{_infodir}/*.info.gz
 %{_mandir}/man1/gawk.1.gz
 %{_mandir}/man1/igawk.1.gz
-%{_mandir}/man1/pgawk.1.gz
+%{_mandir}/man3/*.gz
 
 %changelog

older-automake.diff

@@ -0,0 +1,13 @@
+Index: gawk-4.1.0/configure.ac
+===================================================================
+--- gawk-4.1.0.orig/configure.ac
++++ gawk-4.1.0/configure.ac
+@@ -40,7 +40,7 @@ then
+ fi
+ 
+ AC_PREREQ(2.69)
+-AM_INIT_AUTOMAKE([1.13 dist-xz])
++AM_INIT_AUTOMAKE([1.12 dist-xz])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+