diff --git a/gawk-4.1.1-build-baddest.patch b/gawk-4.1.1-build-baddest.patch deleted file mode 100644 index 83f95be..0000000 --- a/gawk-4.1.1-build-baddest.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e3282563daa30a621cfd57ac424b36dd9fd4dbe4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= -Date: Mon, 21 Apr 2014 11:59:54 +0200 -Subject: Fix build failure because of missing destdir in extension Makefile -References: http://pkgs.fedoraproject.org/cgit/gawk.git/commit/?id=e3282563daa30a621cfd57ac424b36dd9fd4dbe4 -Upstream: yes - -diff -urNp gawk-4.1.1-bak/extension/Makefile.am gawk-4.1.1/extension/Makefile.am ---- gawk-4.1.1-bak/extension/Makefile.am 2014-02-20 19:42:25.000000000 +0100 -+++ gawk-4.1.1/extension/Makefile.am 2014-04-21 11:56:49.227755196 +0200 -@@ -100,7 +100,7 @@ testext_la_LIBADD = $(MY_LIBS) - - install-data-hook: - for i in $(pkgextension_LTLIBRARIES) ; do \ -- $(RM) $(pkgextensiondir)/$$i ; \ -+ $(RM) ${DESTDIR}$(pkgextensiondir)/$$i ; \ - done - - # Keep the uninstall check working: -diff -urNp gawk-4.1.1-bak/extension/Makefile.in gawk-4.1.1/extension/Makefile.in ---- gawk-4.1.1-bak/extension/Makefile.in 2014-04-08 18:13:03.000000000 +0200 -+++ gawk-4.1.1/extension/Makefile.in 2014-04-21 11:57:54.884756674 +0200 -@@ -1231,7 +1231,7 @@ uninstall-man: uninstall-man3 - - install-data-hook: - for i in $(pkgextension_LTLIBRARIES) ; do \ -- $(RM) $(pkgextensiondir)/$$i ; \ -+ $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \ - done - - # Keep the uninstall check working: diff --git a/gawk-4.1.1.tar.xz b/gawk-4.1.1.tar.xz deleted file mode 100644 index 1dfca27..0000000 --- a/gawk-4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efd4c6aafb1ce996309fc903ceb625e7012221c464eb72483dbb23adef1ee8db -size 2196904 diff --git a/gawk-4.1.1.tar.xz.sig b/gawk-4.1.1.tar.xz.sig deleted file mode 100644 index f0d5a17..0000000 --- a/gawk-4.1.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iQEcBAABAgAGBQJTREZiAAoJEN9ZeBWTfsDSSO8H+wYNmqQVcJnZxzxw37PJ11ll -itVeghvOVgHHnrKpEDmf+PEZYRnYkTXzNPvqm3U7Ywr1lXsNGDdni7yrfNdbSRou -cukULkQArXx9RDdUV0cUDwI4GRKrZowUnkPrOSuEWJQbnkMC05nAzEagKSqZ2kKN -qC0cpBQGCYETLtXNd4f6cQE/dgn4PDWtXwkPzxxJLqOTU+9qgEj6KztNROdYOIV9 -fQ09QKV3GaDKutKmBjW9G/JG0XAVqb6EElxInTlUY3sMtQnnykH7DA5MHaV0A+tT -qbf3lxb1vwdVkqPwmLOd2ubgv4tmRUOo8Kj4dzuxJy9aaIW3+0iU2AXv+dRvab8= -=9S+j ------END PGP SIGNATURE----- diff --git a/gawk-4.1.2.tar.xz b/gawk-4.1.2.tar.xz new file mode 100644 index 0000000..0d8eaac --- /dev/null +++ b/gawk-4.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea8b53c5834ee27012fecba7273f97fca7104884975cf81ddae6f85c5581f481 +size 2279136 diff --git a/gawk-4.1.2.tar.xz.sig b/gawk-4.1.2.tar.xz.sig new file mode 100644 index 0000000..26b6cfa --- /dev/null +++ b/gawk-4.1.2.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iQEcBAABAgAGBQJVQInzAAoJEN9ZeBWTfsDSbDUIAMav3ittkQRlW/kdgN+g8FRX +wEMELZJx1h7APa098ay/QaQ6HBrhvm+d+SRR7ZPQTV6+0bggVAVjB3oXu/W8Yf6V +idHkZFNAoMIXkOI2EXnsovmRmlvmTT4C3+SPU5v0A5AjK3jpFHgDrGbWpj3NuUrc +1vDxjatFslepxjEZRS6Vph9nDvBNiYllnCMMRmptlv7bCqwMq4nbpduxO+gJScAO +eEZJOMevpXe3kRbLihBrFjUt9pKTdIjj6FO3A4Uaka296FoufhxauW56BLZ1G5Gb +AkYH9zEjmdeEQ8uAd+rUlOydhdXInX0v2LQlb2IKgHlvCC/pEH/3P++8KYlU1lk= +=6HGs +-----END PGP SIGNATURE----- diff --git a/gawk.changes b/gawk.changes index 1751187..4c1da46 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu May 7 19:13:00 UTC 2015 - astieger@suse.com + +- skip frequently failing and timing dependent test strftime + +------------------------------------------------------------------- +Thu May 7 07:48:15 UTC 2015 - mpluskal@suse.com + +- Correct info files scriplet handling section +- Update info and update-alternatives requirements + +------------------------------------------------------------------- +Sun May 3 09:30:05 UTC 2015 - astieger@suse.com + +- GNU awk 4.1.2: + * manual improved + * The debugger's "restart" command now works again. + * Redirected getline is now allowed inside BEGINFILE/ENDFILE. + * A number of bugs have been fixed in the MPFR code. + * Indirect function calls now work for both built-in and extension + functions. + * Built-in functions are now included in FUNCTAB. + * In non-English locales, it was accidentally possible to use + non-english letters for identifiers + * The "where" command has been added to the debugger as an alias + for "backtrace". + * Gawk no longer explicitly checks the current directory after + doing a path search of AWKPATH. + * Infrastructure upgrades: Automake 1.15, Gettext 0.19.4, + Libtool 2.4.6, Bison 3.0.4. + * If a user-defined function has a parameter with the same name + as another user-defined function, it is no longer possible to + call the second function from inside the first. + * POSIX requires that the names of function parameters not be the + same as any of the special built-in variables and also not + conflict with the names of any functions. Gawk has checked for + the former since 3.1.7. With --posix, it now also checks for + the latter. + * The test suite should check for necessary locales and skip the + tests where it matters if support isn't what it should be. + * Gawk now expects to be compiled on a system with multibyte + character support. +- drop gawk-4.1.1-build-baddest.patch, upstream + ------------------------------------------------------------------- Sat May 3 15:39:14 UTC 2014 - andreas.stieger@gmx.de diff --git a/gawk.spec b/gawk.spec index 78885af..ab23e33 100644 --- a/gawk.spec +++ b/gawk.spec @@ -1,7 +1,7 @@ # # spec file for package gawk # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gawk -Version: 4.1.1 +Version: 4.1.2 Release: 0 Summary: GNU awk License: GPL-3.0+ @@ -26,12 +26,11 @@ Url: http://www.gnu.org/software/gawk/ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: http://savannah.gnu.org/people/viewgpg.php?user_id=80653#/gawk.keyring -Patch1: gawk-4.1.1-build-baddest.patch BuildRequires: update-alternatives -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %{install_info_prereq} -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: update-alternatives +Requires(post): %{install_info_prereq} +Requires(post): update-alternatives +Requires(preun): %{install_info_prereq} +Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,14 +40,16 @@ almost completely POSIX 1003.2 compliant. %prep %setup -q -%patch1 -p1 chmod -x COPYING +# skip strftime time +sed -ie 's/ strftime / /g' test/Makefile.in %build %configure --libexecdir=%{_libdir} make %{?_smp_mflags} %check +# strftime test skipped via prep section make check %{?_smp_mflags} %install @@ -76,14 +77,12 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a %install_info --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz %preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives --remove awk %{_bindir}/gawk fi -%postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz - %files -f %{name}.lang %defattr(-,root,root) #UsrMerge