Update to 2.2.2 upstream release

.gitignore

@@ -28,3 +28,4 @@
 /catch-2.1.2.tar.gz
 /catch-2.2.0.tar.gz
 /catch-2.2.1.tar.gz
+/catch-2.2.2.tar.gz

catch-python3.patch

@@ -0,0 +1,33 @@
+commit 8f9c5c6f83506500ede295179975f2ff6649327b
+Author: Tom Hughes <tom@compton.nu>
+Date:   Fri Apr 6 13:59:08 2018 +0100
+
+    Patch to support python 3
+
+diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
+index a2ab5d5a..d576165f 100755
+--- a/scripts/approvalTests.py
++++ b/scripts/approvalTests.py
+@@ -73,9 +73,9 @@ else:
+ overallResult = 0
+ 
+ def diffFiles(fileA, fileB):
+-    with open(fileA, 'r') as file:
++    with open(fileA, 'r', errors='surrogateescape') as file:
+         aLines = [line.rstrip() for line in file.readlines()]
+-    with open(fileB, 'r') as file:
++    with open(fileB, 'r', errors='surrogateescape') as file:
+         bLines = [line.rstrip() for line in file.readlines()]
+ 
+     shortenedFilenameA = fileA.rsplit(os.sep, 1)[-1]
+@@ -139,8 +139,8 @@ def approve(baseName, args):
+     subprocess.call(args, stdout=f, stderr=f)
+     f.close()
+ 
+-    rawFile = open(rawResultsPath, 'r')
+-    filteredFile = open(filteredResultsPath, 'w')
++    rawFile = open(rawResultsPath, 'r', errors='surrogateescape')
++    filteredFile = open(filteredResultsPath, 'w', errors='surrogateescape')
+     for line in rawFile:
+         filteredFile.write(filterLine(line).rstrip() + "\n")
+     filteredFile.close()

catch.spec

@@ -1,13 +1,15 @@
 %global debug_package %{nil}
 
 Name:           catch
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 Summary:        A modern, C++-native, header-only, framework for unit-tests, TDD and BDD
 
 License:        Boost
 URL:            https://github.com/philsquared/Catch
 Source0:        https://github.com/philsquared/Catch/archive/v%{version}/%{name}-%{version}.tar.gz
+# https://github.com/catchorg/Catch2/pull/1244
+Patch0:         catch-python3.patch
 
 BuildRequires:  cmake make gcc-c++ python3
 
@@ -61,6 +63,9 @@ ctest -V %{?_smp_mflags}
 
 
 %changelog
+* Fri Apr  6 2018 Tom Hughes <tom@compton.nu> - 2.2.2-1
+- Update to 2.2.2 upstream release
+
 * Sun Mar 11 2018 Tom Hughes <tom@compton.nu> - 2.2.1-1
 - Update to 2.2.1 upstream release
 

sources

@@ -1 +1 @@
-SHA512 (catch-2.2.1.tar.gz) = 48d3a0384dcd19fe622c4fda51639be36c904aaff77f5857615010c57e69d8e9f1deb2156e3e4882a592fe260d2bae0efa3cd02c2a2cabe07d9f9db09051a6b0
+SHA512 (catch-2.2.2.tar.gz) = ab91036c6c3ace087d0382ce99f26b2c30a4b75d52f285619ca282a618470fe388afe47495f3b2764268d600c6834c60ba464483d06f3a1c4316c099477c8e38