From 50aeda5fa3276610b9f5e901fac71f7b9ed614c2 Mon Sep 17 00:00:00 2001
From: Jirka Hladky <jhladky@redhat.com>
Date: Sep 27 2019 16:26:55 +0000
Subject: Update to 1.5


---

diff --git a/.gitignore b/.gitignore
index 8bdbe3c..cfd8974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /datamash-1.1.1.tar.gz
 /datamash-1.2.tar.gz
 /datamash-1.3.tar.gz
+/datamash-1.5.tar.gz
diff --git a/datamash-1.3-fix-tests.patch b/datamash-1.3-fix-tests.patch
deleted file mode 100644
index 59a6b56..0000000
--- a/datamash-1.3-fix-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
->From d446dba317aa067440d6312d955d523129949327 Mon Sep 17 00:00:00 2001
-From: Assaf Gordon <address@hidden>
-Date: Thu, 22 Mar 2018 11:00:34 -0600
-Subject: [PATCH 1/2] 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/'}],
- 
- );
- 
--- 
-2.7.4
-
-
->From f4871963974a96d6e69cb80b9c2fac7ff0c1d472 Mon Sep 17 00:00:00 2001
-From: Assaf Gordon <address@hidden>
-Date: Thu, 22 Mar 2018 11:18:13 -0600
-Subject: [PATCH 2/2] 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
--- 
-2.7.4
-
-
diff --git a/datamash.spec b/datamash.spec
index 0c912c1..7f6a541 100644
--- a/datamash.spec
+++ b/datamash.spec
@@ -3,21 +3,18 @@
 # /etc/bash_completion.d seems to be the correct location, with a
 # lot of entries symlinked from /usr/share/bash-completion.
 %define compdir %(pkg-config --exists bash-completion &&
-		     pkg-config --variable=completionsdir bash-completion ||
-		     echo %_sysconfdir/bash_completion.d)
+pkg-config --variable=completionsdir bash-completion ||
+echo %_sysconfdir/bash_completion.d)
 
 Name:           datamash
-Version:        1.3
-Release:        5%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        A statistical, numerical and textual operations tool
 
 License:        GPLv3+
 URL:            https://www.gnu.org/software/%{name}/
 Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-#added upstream patch to fix tests on some platforms
-Patch0:         datamash-1.3-fix-tests.patch
 
-Provides:       bundled(gnulib)
 BuildRequires:  gcc
 BuildRequires:  gettext perl(Digest::MD5) perl(Digest::SHA) perl(Data::Dumper)
 BuildRequires:  pkgconfig bash-completion
@@ -44,12 +41,19 @@ files.
 %find_lang %{name}
 %{__mkdir_p} %{buildroot}%{compdir}
 %{__mv} %{buildroot}%{_datadir}/datamash/bash-completion.d/datamash %{buildroot}%{compdir}
-# rpmlint: E: sourced-script-with-shebang /etc/bash_completion.d/datamash /bin/bash
+# E: non-executable-script /usr/share/bash-completion/completions/datamash 644 /bin/bash
 %{__sed} -i '1d' %{buildroot}%{compdir}/datamash
 
 %check
 %{__make} check
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ];then
+/sbin/install-info –delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %files -f %{name}.lang
 %{_bindir}/datamash
@@ -64,6 +68,9 @@ files.
 %{_mandir}/man1/datamash.1.gz
 
 %changelog
+* Fri Sep 27 2019 Jirka Hladky <hladky.jiri@gmail.com> - 1.5-1
+- New upstream release 1.5
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 5314d6d..e7220a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (datamash-1.3.tar.gz) = 3c36dd01035dc114f2fbfcb8746354e496e6c1536f7b5908cf25632d9cbaddfcd06fc26f8883ef845a6ecd85ceb5708bb7edb3d1b1c6efa273ef5ec0b758366a
+SHA512 (datamash-1.5.tar.gz) = 9f7bff0858a7519ef8efc30ef39c3e99f17e81ed847f1edce6ff28e1191d52fbc173baa5d21d6852effbbf2af800604920d92d412f45519700a9b5809da0e8fa