From ef397d137e1ee03e8e37c025fe3a62eab75f3f2f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 7 Dec 2017 20:56:00 +0100 Subject: [PATCH] - updated to 4.2.0 - updated info,no-pty-test patches - note: C API has been changed, old extensions support dropped - igawk has been dropped --- gawk-info.patch | 79 +++++++++++++++++++++++++++++++++++++++-------- gawk.spec | 38 +++++++++++------------ no-pty-test.patch | 24 +++++++------- 3 files changed, 96 insertions(+), 45 deletions(-) diff --git a/gawk-info.patch b/gawk-info.patch index eb1b160..fedb933 100644 --- a/gawk-info.patch +++ b/gawk-info.patch @@ -1,7 +1,6 @@ -diff -Nru gawk-3.1.3.orig/doc/gawk.texi gawk-3.1.3/doc/gawk.texi ---- gawk-3.1.3.orig/doc/gawk.texi 2003-07-04 19:40:47.000000000 +0200 -+++ gawk-3.1.3/doc/gawk.texi 2003-07-09 09:40:50.000000000 +0200 -@@ -4,13 +4,9 @@ +--- gawk-4.2.0/doc/gawk.texi.orig 2017-12-07 17:43:05.206383320 +0100 ++++ gawk-4.2.0/doc/gawk.texi 2017-12-07 17:46:19.033047774 +0100 +@@ -10,13 +10,10 @@ @settitle The GNU Awk User's Guide @c %**end of header (This is for running Texinfo on a region.) @@ -12,23 +11,77 @@ diff -Nru gawk-3.1.3.orig/doc/gawk.texi gawk-3.1.3/doc/gawk.texi -@end direntry -@dircategory Individual utilities -@direntry --* awk: (gawk)Invoking gawk. Text scanning and processing. +-* awk: (gawk)Invoking Gawk. Text scanning and processing. +* Gawk: (gawk). A text scanning and processing language ++* awk: (gawk)gawk. Text scanning and processing @end direntry - @set xref-automatic-section-title -diff -Nru gawk-3.1.3.orig/doc/gawkinet.texi gawk-3.1.3/doc/gawkinet.texi ---- gawk-3.1.3.orig/doc/gawkinet.texi 2003-05-08 18:26:07.000000000 +0200 -+++ gawk-3.1.3/doc/gawkinet.texi 2003-07-09 09:42:35.000000000 +0200 + @c Enable better indexing, requires texindex from Texinfo 6 or later. +@@ -437,7 +434,7 @@ + * Getting Started:: A basic introduction to using + @command{awk}. How to run an @command{awk} + program. Command-line syntax. +-* Invoking Gawk:: How to run @command{gawk}. ++* gawk:: How to run @command{gawk}. + * Regexp:: All about matching things using regular + expressions. + * Reading Files:: How to read files and manipulate fields. +@@ -1624,7 +1621,7 @@ + provides the essentials you need to know to begin using @command{awk}. + + @item +-@ref{Invoking Gawk}, ++@ref{gawk}, + describes how to run @command{gawk}, the meaning of its + command-line options, and how it finds @command{awk} + program source files. +@@ -2325,7 +2322,7 @@ + @ref{Getting Started} + + @item +-@ref{Invoking Gawk} ++@ref{gawk} + + @item + @ref{Regexp} +@@ -3718,7 +3715,7 @@ + @samp{||}, @samp{&&}, @code{do}, and @code{else}. + @end itemize + +-@node Invoking Gawk ++@node gawk + @chapter Running @command{awk} and @command{gawk} + + This @value{CHAPTER} covers how to run @command{awk}, both POSIX-standard +--- gawk-4.2.0/doc/gawkinet.texi.orig 2017-12-07 17:43:05.506383316 +0100 ++++ gawk-4.2.0/doc/gawkinet.texi 2017-12-07 17:49:30.369712255 +0100 @@ -5,9 +5,9 @@ @c %**end of header (This is for running Texinfo on a region.) @c FIXME: web vs. Web -@dircategory Network applications -+@dircategory Programming languages: ++@dircategory Programming Languages: + @direntry +-* awkinet: (gawkinet). TCP/IP Internetworking With `gawk'. ++* awkinet: (gawkinet). TCP/IP Internetworking With `gawk' + @end direntry + + @c Enable better indexing, requires texindex from Texinfo 6 or later. +--- gawk-4.2.0/doc/gawkworkflow.texi.orig 2017-08-17 06:58:56.000000000 +0200 ++++ gawk-4.2.0/doc/gawkworkflow.texi 2017-12-07 20:35:57.092931555 +0100 +@@ -5,13 +5,9 @@ + @settitle GNU Awk Development Workflow + @c %**end of header (This is for running Texinfo on a region.) + +-@dircategory Text creation and manipulation ++@dircategory Programming Languages: @direntry --* Gawkinet: (gawkinet). TCP/IP Internetworking With `gawk'. -+* Gawkinet: (gawkinet). TCP/IP Internetworking With `gawk' +-* Gawk Work Flow: (gawkworkflow). Participating in @command{gawk} development. +-@end direntry +-@dircategory Individual utilities +-@direntry +-* Gawk Work Flow: (gawkworkflow)Overview. Participating in @command{gawk} development. ++* Gawk Work Flow: (gawkworkflow). Participating in @command{gawk} development @end direntry - @iftex + @c With early 2014 texinfo.tex, restore PDF links and colors diff --git a/gawk.spec b/gawk.spec index 4486750..95d2cab 100644 --- a/gawk.spec +++ b/gawk.spec @@ -13,12 +13,12 @@ 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.1.4 -Release: 2 +Version: 4.2.0 +Release: 1 License: GPL v3+ Group: Applications/Text -Source0: http://ftp.gnu.org/gnu/gawk/%{name}-%{version}.tar.xz -# Source0-md5: 4e7dbc81163e60fd4f0b52496e7542c9 +Source0: http://ftp.gnu.org/gnu/gawk/%{name}-%{version}.tar.lz +# Source0-md5: 716b498c13c96c01758ab59415763e72 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 80753d75be0f469f70e8c90e75121a9c Patch0: %{name}-info.patch @@ -30,18 +30,16 @@ BuildRequires: automake >= 1:1.15 BuildRequires: gettext-tools >= 0.19.7 BuildRequires: gmp-devel BuildRequires: libsigsegv +BuildRequires: lzip BuildRequires: mpfr-devel BuildRequires: readline-devel BuildRequires: tar >= 1:1.22 BuildRequires: texinfo >= 4.3 -BuildRequires: xz Requires: mktemp Requires: sed Obsoletes: gawk-doc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _includedir %{_prefix}/include/awk - %description The gawk packages contains the GNU version of awk, a text processing utility. Awk interprets a special-purpose programming language to do @@ -147,16 +145,16 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__rm} $RPM_BUILD_ROOT%{_bindir}/gawk-%{version} +rm -f $RPM_BUILD_ROOT%{_infodir}/dir + # mawk provides system wide 'awk' %{__rm} $RPM_BUILD_ROOT%{_bindir}/awk -install -d $RPM_BUILD_ROOT%{_includedir} -cp -p *.h $RPM_BUILD_ROOT%{_includedir} - bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} -%{__rm} $RPM_BUILD_ROOT%{_bindir}/gawk-%{version} %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.gawk-non-english-man-pages -rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir +# igawk is declared as obsolete since 4.0.0, dropped in 4.2.0 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/{es,fr,it,ja,pl}/man1/igawk.1 %find_lang %{name} @@ -173,15 +171,15 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS POSIX.STD README %attr(755,root,root) %{_bindir}/gawk -%attr(755,root,root) %{_bindir}/igawk %dir %{_libdir}/awk %attr(755,root,root) %{_libdir}/awk/grcat %attr(755,root,root) %{_libdir}/awk/pwcat %{_libdir}/awk/*.awk %dir %{_libdir}/gawk %attr(755,root,root) %{_libdir}/gawk/*.so +/etc/profile.d/gawk.csh +/etc/profile.d/gawk.sh %{_mandir}/man1/gawk.1* -%{_mandir}/man1/igawk.1* %{_mandir}/man3/filefuncs.3am* %{_mandir}/man3/fnmatch.3am* %{_mandir}/man3/fork.3am* @@ -193,13 +191,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/revtwoway.3am* %{_mandir}/man3/rwarray.3am* %{_mandir}/man3/time.3am* -%lang(es) %{_mandir}/es/man1/* -%lang(fr) %{_mandir}/fr/man1/* -%lang(it) %{_mandir}/it/man1/* -%lang(ja) %{_mandir}/ja/man1/* -%lang(pl) %{_mandir}/pl/man1/* +%lang(es) %{_mandir}/es/man1/gawk.1* +%lang(fr) %{_mandir}/fr/man1/gawk.1* +%lang(it) %{_mandir}/it/man1/gawk.1* +%lang(ja) %{_mandir}/ja/man1/gawk.1* +%lang(pl) %{_mandir}/pl/man1/gawk.1* %{_infodir}/gawk*.info* %files devel %defattr(644,root,root,755) -%{_includedir} +%{_includedir}/gawkapi.h diff --git a/no-pty-test.patch b/no-pty-test.patch index bc9ff85..4c50ead 100644 --- a/no-pty-test.patch +++ b/no-pty-test.patch @@ -1,6 +1,6 @@ ---- gawk-4.1.4/test/Makefile.am.orig 2016-08-24 21:31:55.000000000 +0200 -+++ gawk-4.1.4/test/Makefile.am 2016-08-30 22:03:59.248680327 +0200 -@@ -780,8 +780,6 @@ +--- 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 @@ prt1eval.ok \ prtoeval.awk \ prtoeval.ok \ @@ -9,12 +9,12 @@ rand-mpfr.ok \ rand.awk \ rand.ok \ -@@ -1126,7 +1124,7 @@ - nastyparm negtime next nondec nondec2 \ - patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge procinfs \ - profile0 profile1 profile2 profile3 profile4 profile5 profile6 \ -- profile7 profile8 pty1 \ -+ profile7 profile8 \ - rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \ - rsstart2 rsstart3 rstest6 shadow sortfor sortfor2 sortu split_after_fpat \ - splitarg4 strftime \ +@@ -1261,7 +1259,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 \ + rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin \ + rsstart1 rsstart2 rsstart3 rstest6 \ + shadow shadowbuiltin sortfor sortfor2 sortu sourcesplit split_after_fpat \ -- 2.43.0