diff --git a/0001-Add-yet-another-expansion-of-INF-macro.patch b/0001-Add-yet-another-expansion-of-INF-macro.patch deleted file mode 100644 index cecdab2..0000000 --- a/0001-Add-yet-another-expansion-of-INF-macro.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f0909dfe02df36e70c4c95ed00d53cb3eacf0262 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= - -Date: Sun, 14 Jan 2018 17:04:36 +0100 -Subject: [PATCH] Add yet another expansion of INF macro - -Closes #1151 ---- - scripts/approvalTests.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py -index e16f7140..a2ab5d5a 100755 ---- a/scripts/approvalTests.py -+++ b/scripts/approvalTests.py -@@ -50,6 +50,8 @@ infParser = re.compile(r''' - | - \(__builtin_inff\(\)\) # Linux (ubuntu) INFINITY macro - | -+ \(__builtin_inff\ \(\)\) # Fedora INFINITY macro -+ | - __builtin_huge_valf\(\) # OSX macro - ''', re.VERBOSE) - nanParser = re.compile(r''' --- -2.15.1 - diff --git a/catch-inf.patch b/catch-inf.patch new file mode 100644 index 0000000..cb39b87 --- /dev/null +++ b/catch-inf.patch @@ -0,0 +1,21 @@ +commit f0909dfe02df36e70c4c95ed00d53cb3eacf0262 +Author: Martin Hořeňovský +Date: Sun Jan 14 17:04:36 2018 +0100 + + Add yet another expansion of INF macro + + Closes #1151 + +diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py +index e16f7140..a2ab5d5a 100755 +--- a/scripts/approvalTests.py ++++ b/scripts/approvalTests.py +@@ -50,6 +50,8 @@ infParser = re.compile(r''' + | + \(__builtin_inff\(\)\) # Linux (ubuntu) INFINITY macro + | ++ \(__builtin_inff\ \(\)\) # Fedora INFINITY macro ++ | + __builtin_huge_valf\(\) # OSX macro + ''', re.VERBOSE) + nanParser = re.compile(r''' diff --git a/catch.spec b/catch.spec index 8441417..43d0d31 100644 --- a/catch.spec +++ b/catch.spec @@ -9,12 +9,11 @@ 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/commit/f0909dfe02df36e70c4c95ed00d53cb3eacf0262 -Patch0001: 0001-Add-yet-another-expansion-of-INF-macro.patch +Patch1: catch-inf.patch # https://github.com/catchorg/Catch2/commit/07c84adfbaac181560ed79576848fda82da6311b Patch2: catch-werror.patch -BuildRequires: cmake make gcc-c++ -BuildRequires: %{_bindir}/python3 +BuildRequires: cmake make gcc-c++ python3 %description Catch stands for C++ Automated Test Cases in Headers and is a @@ -37,7 +36,7 @@ is packaged up as a single header for extra convenience. %prep %autosetup -p 1 -n Catch2-%{version} # No python, just python3 -sed -i -e "s|COMMAND python |COMMAND %{_bindir}/python3 |" CMakeLists.txt +sed -i -e "s|COMMAND python |COMMAND python3 |" CMakeLists.txt %build @@ -55,7 +54,7 @@ ctest -V %{?_smp_mflags} %files devel -%doc README.md docs +%doc README.md CODE_OF_CONDUCT.md docs %license LICENSE.txt %{_includedir}/catch/ %{_datadir}/pkgconfig/catch.pc