- updated to 4.2.1 master auto/th/gawk-4.2.1-1
authorJakub Bogusz <qboosh@pld-linux.org>
Fri, 27 Jul 2018 21:00:07 +0000 (23:00 +0200)
committerJakub Bogusz <qboosh@pld-linux.org>
Fri, 27 Jul 2018 21:00:07 +0000 (23:00 +0200)
- updated no-pty-test patch
- removed obsolete 4.2.0 patches

gawk-4.2.0-000-do-not-fold-constant-strings.patch [deleted file]
gawk-4.2.0-001-rwarray-small-improvements.patch [deleted file]
gawk.spec
no-pty-test.patch

diff --git a/gawk-4.2.0-000-do-not-fold-constant-strings.patch b/gawk-4.2.0-000-do-not-fold-constant-strings.patch
deleted file mode 100644 (file)
index eb4a0b0..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 08897b5c5facfd35aa971321a248e6fcd6abf5d8 Mon Sep 17 00:00:00 2001
-From: "Arnold D. Robbins" <arnold@skeeve.com>
-Date: Sat, 21 Oct 2017 20:59:19 +0300
-Subject: [PATCH] Don't fold constant strings if either is translatable.
-
----
- awkgram.y | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/awkgram.y b/awkgram.y
-index 1a75e64..9f35143 100644
---- a/awkgram.y
-+++ b/awkgram.y
-@@ -1589,7 +1589,8 @@ common_exp
-                       // 1.5 ""   # can't fold this if program mucks with CONVFMT.
-                       // See test #12 in test/posix.awk.
--                      if ((n1->flags & (NUMBER|NUMINT)) != 0 || (n2->flags & (NUMBER|NUMINT)) != 0)
-+                      // Also can't fold if one or the other is translatable.
-+                      if ((n1->flags & (NUMBER|NUMINT|INTLSTR)) != 0 || (n2->flags & (NUMBER|NUMINT|INTLSTR)) != 0)
-                               goto plain_concat;
-                       n1 = force_string(n1);
--- 
-2.9.5
-
diff --git a/gawk-4.2.0-001-rwarray-small-improvements.patch b/gawk-4.2.0-001-rwarray-small-improvements.patch
deleted file mode 100644 (file)
index 10059bd..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 750e3168705de678474fea0a551f9cf29e9e077d Mon Sep 17 00:00:00 2001
-From: "Arnold D. Robbins" <arnold@skeeve.com>
-Date: Sat, 28 Oct 2017 23:22:15 +0300
-Subject: [PATCH] Small improvements in extension/rwarray.c.
-
----
- extension/ChangeLog | 5 +++++
- extension/rwarray.c | 6 ++++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/extension/ChangeLog b/extension/ChangeLog
-index 4bfd896..c04e9c2 100644
---- a/extension/ChangeLog
-+++ b/extension/ChangeLog
-@@ -1,3 +1,8 @@
-+2017-10-28         Arnold D. Robbins     <arnold@skeeve.com>
-+
-+      * rwarray.c (do_writea): Fix description in comment.
-+      (write_array): Free the flattened array if writing an element fails.
-+
- 2017-10-19         Arnold D. Robbins     <arnold@skeeve.com>
-       * 4.2.0: Release tar ball made.
-diff --git a/extension/rwarray.c b/extension/rwarray.c
-index 2e82ca7..997b6b2 100644
---- a/extension/rwarray.c
-+++ b/extension/rwarray.c
-@@ -114,7 +114,7 @@ do_writea(int nargs, awk_value_t *result, struct awk_ext_func *unused)
-       if (nargs < 2)
-               goto out;
--      /* directory is first arg, array to dump is second */
-+      /* filename is first arg, array to dump is second */
-       if (! get_argument(0, AWK_STRING, & filename)) {
-               fprintf(stderr, _("do_writea: argument 0 is not a string\n"));
-               errno = EINVAL;
-@@ -178,8 +178,10 @@ write_array(FILE *fp, awk_array_t array)
-               return awk_false;
-       for (i = 0; i < flat_array->count; i++) {
--              if (! write_elem(fp, & flat_array->elements[i]))
-+              if (! write_elem(fp, & flat_array->elements[i])) {
-+                      (void) release_flattened_array(array, flat_array);
-                       return awk_false;
-+              }
-       }
-       if (! release_flattened_array(array, flat_array)) {
--- 
-2.9.5
-
index 2617a97..1571b92 100644 (file)
--- a/gawk.spec
+++ b/gawk.spec
@@ -13,16 +13,14 @@ Summary(ru.UTF-8):  GNU версия утилиты обработки текст
 Summary(tr.UTF-8):     GNU araçları metin düzenleyici
 Summary(uk.UTF-8):     GNU версія утиліти обробки текстів awk
 Name:          gawk
-Version:       4.2.0
-Release:       2
+Version:       4.2.1
+Release:       1
 License:       GPL v3+
 Group:         Applications/Text
 Source0:       http://ftp.gnu.org/gnu/gawk/%{name}-%{version}.tar.lz
-# Source0-md5: 716b498c13c96c01758ab59415763e72
+# Source0-md5: 4b1c1b18f40b5a4bc50e929480b06f89
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 80753d75be0f469f70e8c90e75121a9c
-Patch100:      gawk-4.2.0-000-do-not-fold-constant-strings.patch
-Patch101:      gawk-4.2.0-001-rwarray-small-improvements.patch
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-shutup.patch
 Patch2:                no-pty-test.patch
@@ -122,8 +120,6 @@ Ten pakiet zawiera pliki nagłówkowe dla gawka.
 
 %prep
 %setup -q
-%patch100 -p1
-%patch101 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -136,7 +132,13 @@ Ten pakiet zawiera pliki nagłówkowe dla gawka.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-
+cd extension
+%{__libtoolize}
+%{__aclocal} -I m4 -I ../m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
 %configure \
        --datadir=%{_libdir}
 
index 4c50ead..9538ca7 100644 (file)
@@ -1,19 +1,21 @@
---- gawk-4.2.0/test/Makefile.am.orig   2017-10-17 20:46:48.000000000 +0200
-+++ gawk-4.2.0/test/Makefile.am        2017-12-07 17:51:57.069710581 +0100
-@@ -876,8 +876,6 @@
+--- gawk-4.2.1/test/Makefile.am.orig   2018-07-27 22:17:12.474419365 +0200
++++ gawk-4.2.1/test/Makefile.am        2018-07-27 22:17:55.137752212 +0200
+@@ -887,10 +887,6 @@
        prt1eval.ok \
        prtoeval.awk \
        prtoeval.ok \
 -      pty1.awk \
 -      pty1.ok \
+-      pty2.awk \
+-      pty2.ok \
        rand-mpfr.ok \
        rand.awk \
        rand.ok \
-@@ -1261,7 +1259,7 @@
+@@ -1282,7 +1278,7 @@
        nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
        patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
        procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
--      profile7 profile8 profile9 profile10 pty1 \
+-      profile7 profile8 profile9 profile10 pty1 pty2 \
 +      profile7 profile8 profile9 profile10 \
        rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin \
        rsstart1 rsstart2 rsstart3 rstest6 \
This page took 0.34784 seconds and 4 git commands to generate.