From 6b710a7a0e79ed922363333ce0d525b8e4bfb15b Mon Sep 17 00:00:00 2001 From: nick black Date: Dec 19 2020 02:01:07 +0000 Subject: Merge remote-tracking branch 'origin/master' into epel8 --- diff --git a/.gitignore b/.gitignore index b2bddd3..9659cb9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /doctest-2.3.8.tar.gz /doctest-2.4.0.tar.gz /doctest-2.4.1.tar.gz +/doctest-2.4.2.tar.gz +/doctest-2.4.3.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 deleted file mode 100644 index bc1edc1..0000000 --- a/0001-fixed-build-forgot-to-update-output-from-the-version.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 @@ - -- -+ - - diff --git a/doctest.spec b/doctest.spec index adc7a73..d9289b1 100644 --- a/doctest.spec +++ b/doctest.spec @@ -2,13 +2,12 @@ %global debug_package %{nil} Name: doctest -Version: 2.4.1 +Version: 2.4.3 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 @@ -52,6 +51,9 @@ Requires: libstdc++-devel%{?_isa} %{_libdir}/cmake/%{name}/ %changelog +* Wed Dec 16 2020 Nick Black - 2.4.3-1 +- New upstream release + * Wed Nov 04 2020 Nick Black - 2.4.1-1 - New upstream release - Trivial patch from upstream to fix unit tests diff --git a/sources b/sources index 313b848..7bf9057 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (doctest-2.4.1.tar.gz) = 329d2ef243dcb0d445ffc92be4440694503f9b194dafb003feace4e43bdffa896b29280da7c15e168bf42cf49a6aa6118a3aa101138f109e1533bc8116dfdb6e +SHA512 (doctest-2.4.3.tar.gz) = 8ce97f9dd58b3e3e79954dd4b106af6daf1798cb0fd8ab1fbc762468a09e192a361131d8d91d1cc5f164d1a63f0e15bcc9ada40729406406a0494c332d0e0442