From 67462ed45547dfd38b975ed90729af25adb7696d Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Sun, 23 Jul 2023 10:22:29 +0200
Subject: [PATCH] Added upstream patches.

---
 spdlog-1.12.0-circular_q-size-fix.patch      | 22 +++++++++++++++++++
 spdlog-1.12.0-level_to_string_view-fix.patch | 23 ++++++++++++++++++++
 spdlog.spec                                  |  5 +++++
 3 files changed, 50 insertions(+)
 create mode 100644 spdlog-1.12.0-circular_q-size-fix.patch
 create mode 100644 spdlog-1.12.0-level_to_string_view-fix.patch

diff --git a/spdlog-1.12.0-circular_q-size-fix.patch b/spdlog-1.12.0-circular_q-size-fix.patch
new file mode 100644
index 0000000..c20be00
--- /dev/null
+++ b/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_);
+         }
+     }
+ 
diff --git a/spdlog-1.12.0-level_to_string_view-fix.patch b/spdlog-1.12.0-level_to_string_view-fix.patch
new file mode 100644
index 0000000..94b9a69
--- /dev/null
+++ b/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");
diff --git a/spdlog.spec b/spdlog.spec
index a999c13..8624e17 100644
--- a/spdlog.spec
+++ b/spdlog.spec
@@ -7,6 +7,11 @@ 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