specfile: typo in %changelog NVR fixed (caused by git cherry-pick)

To be backward compatible with 4.1.3 and older code.

gawk-4.1.3-000-info-pages-fixes.patch

@@ -0,0 +1,81 @@
+From e55c8f5c84c1d62469ac6cb5bd2c35e5b6c0a3be Mon Sep 17 00:00:00 2001
+From: "Arnold D. Robbins" <arnold@skeeve.com>
+Date: Wed, 13 Sep 2017 21:50:12 +0300
+Subject: [PATCH] Small fixes to doc for use with info command.
+
+---
+ doc/gawk.info     | 2 +-
+ doc/gawk.texi     | 2 +-
+ doc/gawkinet.info | 2 +-
+ doc/gawkinet.texi | 2 +-
+ doc/gawktexi.in   | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/gawk.info b/doc/gawk.info
+index 1991a3b..73ada88 100644
+--- a/doc/gawk.info
++++ b/doc/gawk.info
+@@ -25,7 +25,7 @@ END-INFO-DIR-ENTRY
+ 
+ INFO-DIR-SECTION Individual utilities
+ START-INFO-DIR-ENTRY
+-* awk: (gawk)Invoking gawk.                     Text scanning and processing.
++* awk: (gawk)Invoking Gawk.                     Text scanning and processing.
+ END-INFO-DIR-ENTRY
+ 
+ 
+diff --git a/doc/gawk.texi b/doc/gawk.texi
+index 18ef080..ca83d5e 100644
+--- a/doc/gawk.texi
++++ b/doc/gawk.texi
+@@ -16,7 +16,7 @@
+ @end direntry
+ @dircategory Individual utilities
+ @direntry
+-* awk: (gawk)Invoking gawk.                     Text scanning and processing.
++* awk: (gawk)Invoking Gawk.                     Text scanning and processing.
+ @end direntry
+ 
+ @ifset FOR_PRINT
+diff --git a/doc/gawkinet.info b/doc/gawkinet.info
+index d726be0..715f216 100644
+--- a/doc/gawkinet.info
++++ b/doc/gawkinet.info
+@@ -3,7 +3,7 @@ gawkinet.texi.
+ 
+ INFO-DIR-SECTION Network applications
+ START-INFO-DIR-ENTRY
+-* Gawkinet: (gawkinet).         TCP/IP Internetworking With `gawk'.
++* awkinet: (gawkinet).          TCP/IP Internetworking With `gawk'.
+ END-INFO-DIR-ENTRY
+ 
+    This is Edition 1.3 of `TCP/IP Internetworking with `gawk'', for the
+diff --git a/doc/gawkinet.texi b/doc/gawkinet.texi
+index 1022323..dfa8cdb 100644
+--- a/doc/gawkinet.texi
++++ b/doc/gawkinet.texi
+@@ -7,7 +7,7 @@
+ 
+ @dircategory Network applications
+ @direntry
+-* Gawkinet: (gawkinet).         TCP/IP Internetworking With `gawk'.
++* awkinet: (gawkinet).          TCP/IP Internetworking With `gawk'.
+ @end direntry
+ 
+ @iftex
+diff --git a/doc/gawktexi.in b/doc/gawktexi.in
+index 0066593..8ac65de 100644
+--- a/doc/gawktexi.in
++++ b/doc/gawktexi.in
+@@ -11,7 +11,7 @@
+ @end direntry
+ @dircategory Individual utilities
+ @direntry
+-* awk: (gawk)Invoking gawk.                     Text scanning and processing.
++* awk: (gawk)Invoking Gawk.                     Text scanning and processing.
+ @end direntry
+ 
+ @ifset FOR_PRINT
+-- 
+2.9.5
+

gawk.spec

@@ -1,27 +1,57 @@
+#
+# Important notes regarding the package:
+# ======================================
+#
+# LICENSES: There are more licenses used inside the gawk source tarball from
+#           upstream than listed in License: field below. However, some of
+#           those files with different license are not used for compiling the
+#           resulting binaries, nor they are additinionally shipped inside the
+#           final package or its subpacakges
+#
+#           To get latest version of currently used licenses in gawk run the
+#           licensecheck. We assume that files that do not explicitly state
+#           their copyright are licensed under GPLv3+ as per COPYING file
+#           inside root directory of source code.
+#
+#           Also, we have to ship additional license files with the package,
+#           because upstream does not include them inside their source tarball:
+#           and never will. They have also confirmed that the additional
+#           licenses shipped are correct. For more info, see:
+#
+#           http://lists.gnu.org/archive/html/bug-gawk/2016-09/msg00008.html
+
+# === GLOBAL MACROS ===========================================================
+
+# According to Fedora Package Guidelines, it is advised that packages that can
+# process untrusted input are build with position-idenpendent code (PIC).
+#
+# Koji should override the compilation flags and add the -fPIC or -fPIE flags by
+# default. This is here just in case this wouldn't happen for some reason.
+# For more info: https://fedoraproject.org/wiki/Packaging:Guidelines#PIE
+%global _hardened_build 1
+
+# We are defining the gawk(abi) version value based on these values, because
+# upstream updates the API from time to time, which breaks the ABI for packages
+# depending on gawk's shared objects. The gawk(abi) version value is exported
+# below via the Provides: field.
+#
+# These values are defined in the gawkapi.h header file. To see them, run:
+#   grep -E "gawk_api_(major|minor).*[[:digit:]]" gawkapi.h
+%global gawk_api_major 1
+%global gawk_api_minor 1
+
+# =============================================================================
+
 Name:             gawk
 Summary:          The GNU version of the AWK text processing utility
 Version:          4.1.3
-Release:          9%{?dist}
+Release:          12%{?dist}
 
-# LICENSE NOTE: There are more licenses used inside the gawk source tarball from
-# ------------- upstream than  listed below, however, some of those files with
-#               different licenses are not used for compiling the resulting
-#               binaries, nor they are additionally shipped inside the final
-#               package or its subpackages.
-#
-# To get latest version of currently used licenses in gawk run: licensecheck
-# We assume that files that do not explicitly state their copyright are licensed
-# under GPLv3+ as per COPYING file inside root directory of source code.
-#
-# UPDATE: Upstream has confirmed that the licenses used here are correct:
-#         http://lists.gnu.org/archive/html/bug-gawk/2016-09/msg00008.html
 License:          GPLv3+ and GPLv2+ and LGPLv2+ and BSD
 
 URL:              https://www.gnu.org/software/gawk/
 Source0:          https://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
 
-# Additional license files that we have to ship with the package because does
-# not include them inside their source tarball and never will (see mail above):
 Source1:          LICENSE.GPLv2
 Source2:          LICENSE.LGPLv2
 Source3:          LICENSE.BSD
@@ -29,19 +59,22 @@ Source3:          LICENSE.BSD
 Provides:         /bin/awk
 Provides:         /bin/gawk
 
+Provides:         gawk(abi) = %{gawk_api_major}.%{gawk_api_minor}
+
 # Safeguard to allow this package to be installed only on UsrMove enabled
 # filesystem. More info: https://fedoraproject.org/wiki/Features/UsrMove
 Requires:         filesystem >= 3
-Requires:         libsigsegv
-Requires:         mpfr
-Requires:         readline
 Requires(post):   info
 Requires(preun):  info
+
 BuildRequires:    ghostscript-core
 BuildRequires:    git
+BuildRequires:    grep
+
 BuildRequires:    libsigsegv-devel
 BuildRequires:    mpfr-devel
 BuildRequires:    readline-devel
+
 BuildRequires:    texinfo-tex
 
 # NOTE: In case any patch updates the awkgram.y or command.y (IOW if anything
@@ -54,16 +87,6 @@ BuildRequires:    texinfo-tex
 #       For more info, see: https://bugzilla.redhat.com/show_bug.cgi?id=1176993
 #BuildRequires:    bison
 
-# === GLOBAL MACROS ===========================================================
-
-# According to Fedora Package Guidelines, it is advised that packages that can
-# process untrusted input are build with position-idenpendent code (PIC).
-#
-# Koji should override the compilation flags and add the -fPIC or -fPIE flags by
-# default. This is here just in case this wouldn't happen for some reason.
-# For more info: https://fedoraproject.org/wiki/Packaging:Guidelines#PIE
-%global _hardened_build 1
-
 # =============================================================================
 
 # NOTE: 'autosetup' macro (below) uses 'git' for applying the patches:
@@ -73,7 +96,7 @@ BuildRequires:    texinfo-tex
 
 # Upstream patches -- official upstream patches released by upstream since the
 # ----------------    last rebase that are necessary for any reason:
-#Patch000: example000.patch
+Patch000: gawk-4.1.3-000-info-pages-fixes.patch
 
 
 # Downstream patches -- these should be always included when doing rebase:
@@ -105,7 +128,8 @@ text processing.
 
 %package devel
 Summary:          Header file for gawk extensions development
-Requires:         %{name}%{?_isa} = %{version}-%{release}
+Requires:         %{name} = %{version}-%{release}
+BuildArch:        noarch
 
 %description devel
 This subpackage provides /usr/include/gawkapi.h header file, which contains
@@ -145,6 +169,7 @@ git add --all --force .
 git commit --all --amend --no-edit > /dev/null
 %autopatch -p1
 
+# ---------------
 
 %build
 %configure
@@ -156,81 +181,110 @@ mkdir -p html/gawk html/gawkinet
 makeinfo --html -I doc -o html/gawk     doc/gawk.texi
 makeinfo --html -I doc -o html/gawkinet doc/gawkinet.texi
 
+# ---------------
 
 %check
 make check
 
+# Check we have correctly specified the ABI version for the current sources:
+api_major_vers=$(grep -i -e "gawk_api_major.*[[:digit:]]" gawkapi.h | grep -o -e "[[:digit:]]")
+api_minor_vers=$(grep -i -e "gawk_api_minor.*[[:digit:]]" gawkapi.h | grep -o -e "[[:digit:]]")
+
+if [[ "$api_major_vers" != %{gawk_api_major} || "$api_minor_vers" != %{gawk_api_minor} ]]; then
+  echo "Build Error: specified gawk(abi) version [%{gawk_api_major}.%{gawk_api_minor}] is different than source code API version [$api_major_vers.$api_minor_vers]!" >&2
+  exit 1
+else
+  unset api_major_vers api_minor_vers
+fi
+
+# ---------------
 
 %install
 %make_install
 
-mkdir -p %{buildroot}%{_bindir}
-ln -sf gawk.1.gz %{buildroot}%{_mandir}/man1/awk.1.gz
-ln -sf gawk %{buildroot}%{_bindir}/awk
-
-# Add additional symlinks to */awk folders:
-ln -sf /usr/share/awk   %{buildroot}%{_datadir}/gawk
-ln -sf /usr/libexec/awk %{buildroot}%{_libexecdir}/gawk
-
-# Fedora does not support multiple versions of same package installed...
-# The */dir file is not necessary for info pages to work correctly...
-# ->> remove the versioned binary hardlink & */dir file
+# Fedora does not support multiple versions of same package installed,
+# and the */dir info file (containing all top nodes) is automatically updated
+# in the %%post and %%postun phases...
 rm -f %{buildroot}%{_bindir}/gawk-%{version}*
 rm -f %{buildroot}%{_infodir}/dir
 
-# Install the all the documentation in the same folder - /usr/share/doc/gawk:
-mkdir -p   %{buildroot}%{_docdir}/%{name}
-cp -a html %{buildroot}%{_docdir}/%{name}
-cp -a doc/gawk.{pdf,ps} doc/gawkinet.{pdf,ps} %{buildroot}%{_docdir}/%{name}
+# Create additional symlinks:
+ln -sf gawk %{buildroot}%{_bindir}/awk
+ln -sf gawk.1.gz %{buildroot}%{_mandir}/man1/awk.1.gz
+
+ln -sf /usr/share/awk   %{buildroot}%{_datadir}/gawk
+ln -sf /usr/libexec/awk %{buildroot}%{_libexecdir}/gawk
 
 # Install NLS language files:
 %find_lang %{name}
 
+# Install the all the documentation in the same folder - /usr/share/doc/gawk:
+install -m 0755 -d %{buildroot}%{_docdir}/%{name}/html/gawk/
+install -m 0755 -d %{buildroot}%{_docdir}/%{name}/html/gawkinet/
+
+install -m 0644 -p html/gawk/*           %{buildroot}%{_docdir}/%{name}/html/gawk/
+install -m 0644 -p html/gawkinet/*       %{buildroot}%{_docdir}/%{name}/html/gawkinet/
+
+install -m 0644 -p doc/gawk.{pdf,ps}     %{buildroot}%{_docdir}/%{name}
+install -m 0644 -p doc/gawkinet.{pdf,ps} %{buildroot}%{_docdir}/%{name}
+
+# ---------------
 
 # Always update the info pages:
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
+# ---------------
 
 %preun
 if [[ $1 -eq 0 ]]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
-
 # === PACKAGING INSTRUCTIONS ==================================================
 
 %files -f %{name}.lang
+%{_bindir}/*awk
+%{_libdir}/gawk
+%{_libexecdir}/*awk
+%{_datadir}/*awk
+
 %{_mandir}/man1/*
 %{_mandir}/man3/*
-%{_infodir}/gawk.info*
-%{_infodir}/gawkinet.info*
-%{_libdir}/gawk
-%{_libexecdir}/awk
-%{_libexecdir}/gawk
-%{_datadir}/awk
-%{_datadir}/gawk
-%{_bindir}/*awk
+%{_infodir}/*awk*.info*
 
 %doc NEWS README POSIX.STD README_d/README.multibyte
 %license COPYING LICENSE.GPLv2 LICENSE.LGPLv2 LICENSE.BSD
 
+# ---------------
 
 %files devel
 %{_includedir}/gawkapi.h
 
+# ---------------
 
-%files doc
 # NOTE: For some reason, adding all files in one line causes RPM build to fail.
-%doc %{_docdir}/%{name}/gawk.pdf
-%doc %{_docdir}/%{name}/gawkinet.pdf
-%doc %{_docdir}/%{name}/gawk.ps
-%doc %{_docdir}/%{name}/gawkinet.ps
+%files doc
+%doc %{_docdir}/%{name}/gawk.{pdf,ps}
+%doc %{_docdir}/%{name}/gawkinet.{pdf,ps}
 %doc %{_docdir}/%{name}/html
 
 # =============================================================================
 
 %changelog
+* Fri Sep 15 2017 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 4.1.3-12
+- Chanelog's NVR typo (after git cherry-pick) fixed
+
+* Fri Sep 15 2017 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 4.1.3-11
+- Revert previous change of adding 'awk*' symlinks for info pages (bug #1486924)
+- Added patch to correctly fix the info pages issue (bug #1486924)
+- specfile content refactored for better readability
+- Package now provides its ABI version via gawk(abi)
+- Added test for usage of correct gawk(abi) into %%check section
+
+* Thu Aug 31 2017 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 4.1.3-10
+- Added 'awk*' symlinks for info pages (bug #1486924)
+
 * Mon Sep 12 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 4.1.3-9
 - Build gawk with readline support (useful for gawk debugger)
 
@@ -654,4 +708,3 @@ is defined or not. (For ppc64)
 
 * Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
 - built against glibc
-