From f263b48fff6aee80d77a9ac37da12f2a84ccd499 Mon Sep 17 00:00:00 2001 From: nick black Date: Nov 04 2020 17:56:53 +0000 Subject: patch from upstream to fix unit tests --- diff --git a/0001-fixed-build-forgot-to-update-output-from-the-version.patch b/0001-fixed-build-forgot-to-update-output-from-the-version.patch new file mode 100644 index 0000000..9567649 --- /dev/null +++ b/0001-fixed-build-forgot-to-update-output-from-the-version.patch @@ -0,0 +1,45 @@ +From 8424be522357e68d8c6178375546bb0cf9d5f6b3 Mon Sep 17 00:00:00 2001 +From: Viktor Kirilov +Date: Wed, 4 Nov 2020 19:07:02 +0200 +Subject: [PATCH] fixed build - forgot to update output from the version test + +--- + doctest/doctest.h | 4 ++-- + examples/all_features/test_output/version.txt | 2 +- + examples/all_features/test_output/version_xml.txt | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git doctest/doctest.h doctest/doctest.h +index d1e0974..acbe6cd 100644 +--- doctest/doctest.h ++++ doctest/doctest.h +@@ -48,8 +48,8 @@ + + #define DOCTEST_VERSION_MAJOR 2 + #define DOCTEST_VERSION_MINOR 4 +-#define DOCTEST_VERSION_PATCH 0 +-#define DOCTEST_VERSION_STR "2.4.0" ++#define DOCTEST_VERSION_PATCH 1 ++#define DOCTEST_VERSION_STR "2.4.1" + + #define DOCTEST_VERSION \ + (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH) +diff --git examples/all_features/test_output/version.txt examples/all_features/test_output/version.txt +index c2ca0d5..7b2fdc3 100644 +--- examples/all_features/test_output/version.txt ++++ examples/all_features/test_output/version.txt +@@ -1 +1 @@ +-[doctest] doctest version is "2.4.0" ++[doctest] doctest version is "2.4.1" +diff --git examples/all_features/test_output/version_xml.txt examples/all_features/test_output/version_xml.txt +index c91c75b..9ef679d 100644 +--- examples/all_features/test_output/version_xml.txt ++++ examples/all_features/test_output/version_xml.txt +@@ -1,4 +1,4 @@ + +- ++ + + +-- +2.29.2 diff --git a/doctest.spec b/doctest.spec index 33318ac..adc7a73 100644 --- a/doctest.spec +++ b/doctest.spec @@ -8,6 +8,7 @@ Summary: Feature-rich header-only C++ testing framework License: MIT URL: https://github.com/onqtam/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch1: 0001-fixed-build-forgot-to-update-output-from-the-version.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -53,6 +54,7 @@ Requires: libstdc++-devel%{?_isa} %changelog * Wed Nov 04 2020 Nick Black - 2.4.1-1 - New upstream release +- Trivial patch from upstream to fix unit tests * Mon Jul 27 2020 Fedora Release Engineering - 2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild