From 2ad4c565c066d2af583c93fac82f1109885c07ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 2 Sep 2019 13:13:50 +0200
Subject: [PATCH] 3.7.4 bump

---
 .gitignore                                    |  1 +
 ...e-3.7.4-Port-other-tests-to-Python-3.patch | 52 +++++++++++--------
 recode.spec                                   |  7 ++-
 sources                                       |  2 +-
 4 files changed, 36 insertions(+), 26 deletions(-)
 rename recode-3.7.1-Port-other-tests-to-Python-3.patch => recode-3.7.4-Port-other-tests-to-Python-3.patch (76%)

diff --git a/.gitignore b/.gitignore
index ddce134..eb84923 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ recode-3.6.tar.gz
 /recode-3.7.1.tar.gz
 /recode-3.7.2.tar.gz
 /recode-3.7.3.tar.gz
+/recode-3.7.4.tar.gz
diff --git a/recode-3.7.1-Port-other-tests-to-Python-3.patch b/recode-3.7.4-Port-other-tests-to-Python-3.patch
similarity index 76%
rename from recode-3.7.1-Port-other-tests-to-Python-3.patch
rename to recode-3.7.4-Port-other-tests-to-Python-3.patch
index e15b0f4..4b4bcf2 100644
--- a/recode-3.7.1-Port-other-tests-to-Python-3.patch
+++ b/recode-3.7.4-Port-other-tests-to-Python-3.patch
@@ -1,8 +1,14 @@
-From 1f041f1a47cb9862bcc26dc9a2273529eb7b9e31 Mon Sep 17 00:00:00 2001
+From 72564d53c8c841f2a13d2a0cc6a38910b36bb306 Mon Sep 17 00:00:00 2001
 From: perl-Git-CPAN-Patch Owner <perl-Git-CPAN-Patch-owner@fedoraproject.org>
 Date: Fri, 16 Aug 2019 12:43:18 +0200
 Subject: [PATCH] Port other tests to Python 3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
+Ported to 3.7.4.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
 ---
  tests/pytest         | 8 ++++----
  tests/t50_methods.py | 8 ++++----
@@ -50,7 +56,7 @@ index 4489592..8e39d2a 100755
              except Skipped:
                  return
 diff --git a/tests/t50_methods.py b/tests/t50_methods.py
-index 66da2e6..f0d5b6f 100644
+index 696bb28..aaf3997 100644
 --- a/tests/t50_methods.py
 +++ b/tests/t50_methods.py
 @@ -5,7 +5,7 @@ from __main__ import py
@@ -61,27 +67,27 @@ index 66da2e6..f0d5b6f 100644
 +input = open(input_name, 'rb').read()
  
  def test_1():
+     # No step at all.
+@@ -41,7 +41,7 @@ def validate(request):
+     command = ('$R --quiet --force < %s %s'
+                '| $R --quiet --force %s..%s'
+                % (input_name, request, after, before))
+-    print command
++    print(command)
+     output = common.external_output(command)
+     common.assert_or_diff(output, input)
  
-@@ -65,7 +65,7 @@ def validate(request, sequence, mode):
-         command = ('$R --quiet --force --sequence=%s < %s %s'
-                    '| $R --quiet --force --sequence=%s %s..%s'
-                    % (sequence, input_name, request, sequence, after, before))
--        print command
-+        print(command)
-         output = common.external_output(command)
-     elif mode == 'squash':
-         file(common.run.work, 'wb').write(input)
-@@ -74,8 +74,8 @@ def validate(request, sequence, mode):
-         command2 = ('$R --quiet --force --sequence=%s %s..%s %s'
-                     % (sequence, after, before, common.run.work))
- 
--        print command1
--        print command2
-+        print(command1)
-+        print(command2)
-         common.external_output(command1)
-         common.external_output(command2)
-         output = file(common.run.work, 'rb').read()
+@@ -51,8 +51,8 @@ def validate(request):
+                 % (request, common.run.work))
+     command2 = ('$R --quiet --force %s..%s %s'
+                 % (after, before, common.run.work))
+-    print command1
+-    print command2
++    print(command1)
++    print(command2)
+     common.external_output(command1)
+     common.external_output(command2)
+     output = file(common.run.work, 'rb').read()
 diff --git a/tests/t90_bigauto.py b/tests/t90_bigauto.py
 index 861cce6..46d4cd4 100644
 --- a/tests/t90_bigauto.py
@@ -105,5 +111,5 @@ index 861cce6..46d4cd4 100644
                      if type == 'Shrunk to':
                          steps = self.get_steps(shrunk_to)
 -- 
-2.23.0.rc2
+2.21.0
 
diff --git a/recode.spec b/recode.spec
index d7d20a5..1d5ef9d 100644
--- a/recode.spec
+++ b/recode.spec
@@ -4,7 +4,7 @@
 %bcond_with recode_enables_python3_test
 
 Name:       recode
-Version:    3.7.3
+Version:    3.7.4
 Release:    1%{?dist}
 Summary:    Conversion between character sets and surfaces
 # COPYING:              GPLv3 text
@@ -65,7 +65,7 @@ Patch0:     recode-3.7.1-Rename-coliding-hash-functions.patch
 Patch1:     recode-3.7.1-python-3-compatibility.patch
 # 2/2 Adapt tests to Python3, unfinished,
 # <https://github.com/rrthomas/recode/issues/15>
-Patch2:     recode-3.7.1-Port-other-tests-to-Python-3.patch
+Patch2:     recode-3.7.4-Port-other-tests-to-Python-3.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -163,6 +163,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/*
 
 %changelog
+* Mon Sep 02 2019 Petr Pisar <ppisar@redhat.com> - 3.7.4-1
+- 3.7.4 bump
+
 * Mon Sep 02 2019 Petr Pisar <ppisar@redhat.com> - 3.7.3-1
 - 3.7.3 bump
 
diff --git a/sources b/sources
index c2d0565..1a0f046 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (recode-3.7.3.tar.gz) = f5172937631b2770a5ebeead9d1eafd76212f7272fcce9eb81eae9d946eb56898ffd04cc3e0b67d494c284db138bbada8453a60a65ffe23a5f100f8a5cf33098
+SHA512 (recode-3.7.4.tar.gz) = 1ef2b60508d9cd84235fe5ae74d12eee6bd2987695871c4ba9c9111532a9c2638f2f6a5ab77eec7e3774b09f0e0a5d0555a2d2e21c94e5a6a0e7a4b0df9da79c