From 34bd841a977bba9ae1f7d0d1246f526087bfbd01 Mon Sep 17 00:00:00 2001
From: nick black <nickblack@linux.com>
Date: Nov 04 2020 21:22:05 +0000
Subject: Merge remote-tracking branch 'origin/master' into epel8


---

diff --git a/.gitignore b/.gitignore
index ca87cf4..b2bddd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /doctest-2.3.7.tar.gz
 /doctest-2.3.8.tar.gz
 /doctest-2.4.0.tar.gz
+/doctest-2.4.1.tar.gz
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..bc1edc1
--- /dev/null
+++ b/0001-fixed-build-forgot-to-update-output-from-the-version.patch
@@ -0,0 +1,32 @@
+diff --git doctest/doctest.h doctest/doctest.h
+index d1e0974..acbe6cd 100644
+--- a/doctest/doctest.h
++++ b/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
+--- a/examples/all_features/test_output/version.txt
++++ b/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
+--- a/examples/all_features/test_output/version_xml.txt
++++ b/examples/all_features/test_output/version_xml.txt
+@@ -1,4 +1,4 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<doctest binary="all_features" version="2.4.0">
++<doctest binary="all_features" version="2.4.1">
+   <Options order_by="file" rand_seed="324" first="0" last="4294967295" abort_after="0" subcase_filter_levels="2147483647" case_sensitive="false" no_throw="false" no_skip="false"/>
+ </doctest>
diff --git a/doctest.spec b/doctest.spec
index ace3b74..adc7a73 100644
--- a/doctest.spec
+++ b/doctest.spec
@@ -2,15 +2,17 @@
 %global debug_package %{nil}
 
 Name: doctest
-Version: 2.4.0
-Release: 2%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
 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
+BuildRequires: git
 
 %description
 A fast (both in compile times and runtime) C++ testing framework, with the
@@ -50,6 +52,10 @@ Requires: libstdc++-devel%{?_isa}
 %{_libdir}/cmake/%{name}/
 
 %changelog
+* Wed Nov 04 2020 Nick Black <dankamongmen@gmail.com> - 2.4.1-1
+- New upstream release
+- Trivial patch from upstream to fix unit tests
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 4cdf599..313b848 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (doctest-2.4.0.tar.gz) = 96e8a7ceafbe99fbc09e3b5617c799cf0ff28102b24392ec14b55cd525e9dd156a996e578168009a494a7deb64f640d19b79137e5c067d103dba23d7c3375400
+SHA512 (doctest-2.4.1.tar.gz) = 329d2ef243dcb0d445ffc92be4440694503f9b194dafb003feace4e43bdffa896b29280da7c15e168bf42cf49a6aa6118a3aa101138f109e1533bc8116dfdb6e