diff --git a/datamash-1.3.tar.gz b/datamash-1.3.tar.gz deleted file mode 100644 index d248cf4..0000000 --- a/datamash-1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eebb52171a4353aaad01921384098cf54eb96ebfaf99660e017f6d9fc96657a6 -size 1939375 diff --git a/datamash-1.3.tar.gz.sig b/datamash-1.3.tar.gz.sig deleted file mode 100644 index a6077fc..0000000 --- a/datamash-1.3.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCgAGBQJarA+nAAoJEAoRth02V7kBS8wP/R+BA21W4zZWG07cj7CwQWqH -3qSUgw/TaC/140KH97WfuhvCP+l189bRU78nP3vnjR4nTS+IrepAxSsnR63+9YeY -1itBWkorgmxdAQQjRjpKzsSt6vnzvKZueqJahO50itmrob7HQKPamBJtFP3R8llp -cwAA2L2m+P3XzW3a6R2uO8ReSu4VK6LwykCkS1Ye/M/n5TDdu7jGZ54q207trRfx -faWrr0Ei01IFC0LGsLtmQR9VGqLzgfOnAAO1AoeTLdjXgLnLB1CjnxCB1gUUutfK -MRRB3+tYLd3LAUTumkPTOldrRlQncZMU2HaPJnmq7rx6wIUxry+rGc4mk5ttbiG0 -HHYbeRYPI9GdG/7anhw480IckU7CX1rR51Kw+gZdreJ/yovWIH3MqEhSGwe/oeTB -/pGryCxzWSWJMjWX69GsTy5h0bosB+QMZgOrULiTE6othJYL1em7NdcONS3JhI2O -vAcku43Nqr4X5TWJBY2MYsA/7v+1s2rFPFX7DDZO/j4s79KIq7DaPJgI++X1otPA -x82a0n2oSkQ2DptjxwV63RkZA26lRM7Q3AVQYFX156acqXR5wieL11bdvcPjLEaD -dvam+jW4NshB9sY0mTxhN55DrWxEWh7nFzg/MpLfxup1TRVbuGN3c2xjoyeX7rBw -eWeI+C97rM/ba+3AlLtc -=kHAo ------END PGP SIGNATURE----- diff --git a/datamash-1.4.tar.gz b/datamash-1.4.tar.gz new file mode 100644 index 0000000..eba48b5 --- /dev/null +++ b/datamash-1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a +size 2013538 diff --git a/datamash-1.4.tar.gz.sig b/datamash-1.4.tar.gz.sig new file mode 100644 index 0000000..19e7a17 --- /dev/null +++ b/datamash-1.4.tar.gz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEk9dHL9IvGUhfBM3GChG2HTZXuQEFAlwe+NQACgkQChG2HTZX +uQHNHg/+NvyZ9aLYbrcWSQY/jRhR0oXYX698djDM2E1PkmD2cmI11JXYGAgcCGX9 +ZiGdy+WYGt0u+FKD4qIX9ndlBdT8+caxpYXDXCH4MtpM5nvO/YC/gkeaQVDXGvB3 +L7bQ6iv2QO0CvJ3M9Pxzlhoy8RMiJpje55SdKXxKZvglo2+r8GIsxvZYHnmUarf3 +XEM4Qdvsu10gK3FTPmC8WOa3Rdiw91D/apcjDH+gaAlOWkm9sueUQKwRAn2/C7Dh +AubDMnPDRBhxGbztjFjJhWCcNhlIxb6QnhmiqZrT+m/r9BONFuzljGyhNY0d03ru +rxPtmpwG6XTrgDVJ63kJ1OG5ZhbzZ/Gti/PzBL/zHjcyIMnsvVYZx1QGFLC09gTE +kZEarJBEBECjpXDJiSMHdPwbupCvM6QwkwoiL6hm6UolidAMLjpb7jADtd7bEezz +m0wLI08Rma+TKvsA/zLdTL930qzY1ox4xKUhREf0Mzr9SerSdaMU5ohgTOhOTtLI +vX5R8vMljrNmUcnQ8pNWaX2dNlatX3QLcZvFSmqEJeFdEBlTLKcBHWuZa29Zb5HP +U8DWsEF762TkDzc0T0pua4pwiwluYXmjQRylbFJTz72SkYWx+1/uYyFVV/qDT6iD +nYLdARHcbrIOMs5vUYv6kcVyvkHzg8sIiv0ypAugai6JDPlTGy0= +=zwRt +-----END PGP SIGNATURE----- diff --git a/datamash.changes b/datamash.changes index c07a9bb..b69d758 100644 --- a/datamash.changes +++ b/datamash.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Dec 26 20:05:24 UTC 2018 - astieger@suse.com + +- update to 1.4: + * New option: -C/--skip-comments to skip comment lines +- drop upsteamed patches: + * upstream-disable-broken-test.patch + * upstream-fix-test.patch + ------------------------------------------------------------------- Fri Mar 23 08:43:03 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/datamash.spec b/datamash.spec index d8c92c8..e9f30b9 100644 --- a/datamash.spec +++ b/datamash.spec @@ -12,24 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: datamash -Version: 1.3 +Version: 1.4 Release: 0 Summary: Statistical, numerical and textual operations in the command line License: GPL-3.0-or-later Group: Productivity/Scientific/Math -Url: https://www.gnu.org/software/datamash/ +URL: https://www.gnu.org/software/datamash/ Source: https://ftp.gnu.org/gnu/datamash/%{name}-%{version}.tar.gz Source2: https://ftp.gnu.org/gnu/datamash/%{name}-%{version}.tar.gz.sig Source3: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=datamash&download=1#/%{name}.keyring -# PTACH-FIX-UPSTREAM upstream-disable-broken-test.patch guillaume@opensuse.org -- Disable broken test (fix AArch64) -Patch0: upstream-disable-broken-test.patch -# PATCH-FIX-UPSTREAM upstream-fix-test.patch guillaume@opensuse.org -- Rework a test (fix armv7l and PPC64) -Patch1: upstream-fix-test.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(openssl) Requires(post): %{install_info_prereq} @@ -41,8 +37,6 @@ textual and statistical operations on input textual data files. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure \ @@ -71,8 +65,8 @@ make %{?_smp_mflags} check %license COPYING %doc ChangeLog README AUTHORS THANKS TODO %{_bindir}/%{name} -%{_mandir}/man1/*.1%{ext_man} -%{_infodir}/%{name}.info%{ext_info} +%{_mandir}/man1/*.1%{?ext_man} +%{_infodir}/%{name}.info%{?ext_info} %{_datadir}/%{name} %changelog diff --git a/upstream-disable-broken-test.patch b/upstream-disable-broken-test.patch deleted file mode 100644 index 6561b4c..0000000 --- a/upstream-disable-broken-test.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f4871963974a96d6e69cb80b9c2fac7ff0c1d472 Mon Sep 17 00:00:00 2001 -From: Assaf Gordon -Date: Thu, 22 Mar 2018 11:18:13 -0600 -Subject: tests: disable --format="%a" test - -Valid output can differ (e.g. 0x8.000p-3 vs 0x1.000p+0). - -* tests/datamash-output-format.pl: Disable 'a1' test. ---- - tests/datamash-output-format.pl | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/datamash-output-format.pl b/tests/datamash-output-format.pl -index ca99bb0..5e90ae0 100755 ---- a/tests/datamash-output-format.pl -+++ b/tests/datamash-output-format.pl -@@ -90,7 +90,9 @@ my @Tests = - ['e2', '--format "%.3e" sum 1', {IN_PIPE=>$in1}, {OUT=>"1.000e+00\n"}], - - # Test Custom formats: %a -- ['a1', '--format "%0.3a" sum 1', {IN_PIPE=>$in1}, {OUT=>"0x8.000p-3\n"}], -+ # Disable the test for now. Valid output can differ (e.g. 0x8.000p-3 and -+ # 0x1.000p0 ). -+ # ['a1', '--format "%0.3a" sum 1', {IN_PIPE=>$in1}, {OUT=>"0x8.000p-3\n"}], - - - # Custom formats can use lots of memory --- -cgit v1.0-41-gc330 - diff --git a/upstream-fix-test.patch b/upstream-fix-test.patch deleted file mode 100644 index 829aecb..0000000 --- a/upstream-fix-test.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d446dba317aa067440d6312d955d523129949327 Mon Sep 17 00:00:00 2001 -From: Assaf Gordon -Date: Thu, 22 Mar 2018 11:00:34 -0600 -Subject: tests: fix --format='%4000f' expected output - -Can be 1.000009... or 1.000008999, depending on representation. - -* tests/datamash-output-format.pl: Check only the first 5 digits. ---- - tests/datamash-output-format.pl | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/datamash-output-format.pl b/tests/datamash-output-format.pl -index 52c68a2..ca99bb0 100755 ---- a/tests/datamash-output-format.pl -+++ b/tests/datamash-output-format.pl -@@ -98,12 +98,13 @@ my @Tests = - {OUT => "0" x 3999 . "1\n"}], - - # due to binary floating representation, some decimal point digits won't be -- # zero (e.g. 1.0000090000000000000000000000000523453254320000000...). -- # The OUT_SUBST replaces exactly 3994 digits (as expected from the format) -+ # zero (e.g. 1.0000090000000000000000000000000523453254320000000... or -+ # 1.000008999999...). -+ # The OUT_SUBST replaces exactly 3995 digits (as expected from the format) - # with an "X". - ['m2', '--format "%.4000f" sum 1', {IN_PIPE=>$in1}, -- {OUT => "1.000009X\n"}, -- {OUT_SUBST => 's/^(1\.000009)([0-9]{3994})$/\1X/'}], -+ {OUT => "1.00000X\n"}, -+ {OUT_SUBST => 's/^(1\.00000)([0-9]{3995})$/\1X/'}], - - ); - --- -cgit v1.0-41-gc330 -