Added upstream patches.

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,8 +1 @@
-/gabime-spdlog-211ce99.tar.gz
-/gabime-spdlog-cbc8ba7.tar.gz
-/gabime-spdlog-34bb86b.tar.gz
-/v0.10.0.tar.gz
-/v0.17.0.tar.gz
-/v1.0.0.tar.gz
-/v1.1.0.tar.gz
-/v1.2.1.tar.gz
+/spdlog-*.tar.gz

sources

@@ -1 +1 @@
-SHA512 (v1.2.1.tar.gz) = 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
+SHA512 (spdlog-1.12.0.tar.gz) = db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d

spdlog-1.12.0-circular_q-size-fix.patch

@@ -0,0 +1,22 @@
+From d8d23a660601a406a1e1aa07380b5b1c5781c190 Mon Sep 17 00:00:00 2001
+From: Gabi Melman <gmelman1@gmail.com>
+Date: Fri, 21 Jul 2023 00:37:03 +0300
+Subject: [PATCH] Fix #2820
+
+---
+ include/spdlog/details/circular_q.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/spdlog/details/circular_q.h b/include/spdlog/details/circular_q.h
+index e4fd5fd4a..d40e14189 100644
+--- a/include/spdlog/details/circular_q.h
++++ b/include/spdlog/details/circular_q.h
+@@ -82,7 +82,7 @@ class circular_q
+         }
+         else
+         {
+-            return max_items_ - (head_ - tail_);
++            return max_items_ - 1 - (head_ - tail_);
+         }
+     }
+ 

spdlog-1.12.0-level_to_string_view-fix.patch

@@ -0,0 +1,23 @@
+From 2ee8bac78e6525a8ad9a9196e65d502ce390d83a Mon Sep 17 00:00:00 2001
+From: xvitaly <vitaly@easycoding.org>
+Date: Sun, 23 Jul 2023 10:15:25 +0200
+Subject: [PATCH] Added missing square bracket to fix the level_to_string_view
+ test. (#2827)
+
+---
+ tests/test_misc.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp
+index 9f3cb1744..6199641ff 100644
+--- a/tests/test_misc.cpp
++++ b/tests/test_misc.cpp
+@@ -43,7 +43,7 @@ TEST_CASE("log_levels", "[log_levels]")
+     REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello");
+ }
+ 
+-TEST_CASE("level_to_string_view", "[convert_to_string_view")
++TEST_CASE("level_to_string_view", "[convert_to_string_view]")
+ {
+     REQUIRE(spdlog::level::to_string_view(spdlog::level::trace) == "trace");
+     REQUIRE(spdlog::level::to_string_view(spdlog::level::debug) == "debug");

spdlog.spec

@@ -1,60 +1,169 @@
-%global user            gabime
-%global debug_package   %{nil}
-
 Name:           spdlog
-Version:        1.2.1
-Release:        1%{?dist}
-Summary:        Super fast C++ logging library
-Group:          Development/Libraries
-License:        MIT
-URL:            https://github.com/%{user}/%{name}/
-Source0:        https://github.com/%{user}/%{name}/archive/v%{version}.tar.gz
+Version:        1.12.0
+Release:        2%{?dist}
 
-BuildRequires:  ninja-build
-BuildRequires:  gcc-c++
+License:        MIT
+Summary:        Super fast C++ logging library
+URL:            https://github.com/gabime/%{name}
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+
+# https://github.com/gabime/spdlog/commit/d8d23a660601a406a1e1aa07380b5b1c5781c190
+Patch100:       %{name}-1.12.0-circular_q-size-fix.patch
+# https://github.com/gabime/spdlog/commit/2ee8bac78e6525a8ad9a9196e65d502ce390d83a
+Patch101:       %{name}-1.12.0-level_to_string_view-fix.patch
+
+BuildRequires:  catch-devel >= 3.0.0
 BuildRequires:  cmake
+BuildRequires:  fmt-devel >= 9.1.0
 BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  google-benchmark-devel
+BuildRequires:  ninja-build
 
 %description
-This is a packaged version of the gabime/spdlog header-only C++
-logging library available at Github.
+This is a packaged version of the gabime/spdlog C++ logging
+library available at Github.
 
 %package devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
-Provides:       %{name}-static = %{version}-%{release}
-Provides:       %{name} = %{version}-%{release}
-Requires:       libstdc++-devel
+Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       libstdc++-devel%{?_isa}
+Requires:       fmt-devel%{?_isa}
 
 %description devel
 The %{name}-devel package contains C++ header files for developing
 applications that use %{name}.
 
 %prep
-%autosetup
-mkdir -p %{_target_platform}
-find . -name '.gitignore' -exec rm {} \;
-sed -i -e "s,\r,," README.md
+%autosetup -p1
+find . -name '.gitignore' -delete
+sed -e "s,\r,," -i README.md
+rm -f tests/catch.hpp
 
 %build
-pushd %{_target_platform}
-    %cmake -G Ninja \
+%cmake -G Ninja \
+    -DCMAKE_INSTALL_LIBDIR=%{_lib} \
     -DCMAKE_BUILD_TYPE=Release \
-    ..
-popd
-%ninja_build -C %{_target_platform}
+    -DSPDLOG_BUILD_SHARED=ON \
+    -DSPDLOG_BUILD_EXAMPLE=OFF \
+    -DSPDLOG_BUILD_BENCH=OFF \
+    -DSPDLOG_BUILD_TESTS=ON \
+    -DSPDLOG_INSTALL=ON \
+    -DSPDLOG_FMT_EXTERNAL=ON
+%cmake_build
+
+%check
+%ctest
 
 %install
-%ninja_install -C %{_target_platform}
+%cmake_install
+
+%files
+%license LICENSE
+%doc README.md
+%{_libdir}/lib%{name}.so.1*
 
 %files devel
-%doc README.md example/
-%license LICENSE
+%doc example
 %{_includedir}/%{name}
+%{_libdir}/lib%{name}.so
 %{_libdir}/cmake/%{name}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jul 08 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1.12.0-1
+- Updated to version 1.12.0.
+
+* Mon May 29 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-6
+- Rebuilt due to fmt library update.
+
+* Wed Mar 01 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-5
+- Ported to catch v3. Fixed FTBFS in ELN.
+
+* Tue Feb 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-4
+- Fixed FTBFS in EPEL/ELN due to catch v3 update.
+
+* Tue Feb 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-3
+- Fixed FTBFS due to catch v3 update.
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Nov 03 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-1
+- Updated to version 1.11.0.
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jul 10 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.10.0-2
+- Rebuilt due to fmt library update.
+
+* Mon Apr 18 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.10.0-1
+- Updated to version 1.10.0.
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Sep 15 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.9.2-2
+- Rebuilt due to google-benchmark 1.6.0 update.
+
+* Fri Aug 13 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.9.2-1
+- Updated to version 1.9.2.
+
+* Tue Jul 27 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.9.1-1
+- Updated to version 1.9.1.
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 21 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.9.0-1
+- Updated to version 1.9.0.
+
+* Sun Jul 04 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.5-2
+- Rebuilt due to fmt library update.
+
+* Fri Apr 02 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.5-1
+- Updated to version 1.8.5.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Dec 12 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.2-1
+- Updated to version 1.8.2.
+
+* Tue Oct 13 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.1-1
+- Updated to version 1.8.1.
+
+* Sat Sep 05 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.0-1
+- Updated to version 1.8.0.
+
+* Tue Jul 21 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.7.0-1
+- Updated to version 1.7.0.
+
+* Tue Jun 02 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.6.1-1
+- Updated to version 1.6.1.
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 27 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.0-1
+- Updated to version 1.5.0.
+
+* Wed Dec 18 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 1.4.2-1
+- Updated to version 1.4.2.
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Jan 20 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 1.3.1-1
+- Updated to version 1.3.1.
+
 * Mon Nov 05 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 1.2.1-1
 - Updated to version 1.2.1.