From 27d6aa363b6ce3475de68937f545afbba8080410 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Wed, 28 Jun 2023 08:14:31 +0200
Subject: [PATCH] Rebuilt due to fmt library update.

---
 spdlog-fmt10-compatibility.patch | 39 ++++++++++++++++++++++++++++++++
 spdlog.spec                      |  7 +++++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 spdlog-fmt10-compatibility.patch

diff --git a/spdlog-fmt10-compatibility.patch b/spdlog-fmt10-compatibility.patch
new file mode 100644
index 0000000..6717370
--- /dev/null
+++ b/spdlog-fmt10-compatibility.patch
@@ -0,0 +1,39 @@
+From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001
+From: H1X4 <10332146+H1X4Dev@users.noreply.github.com>
+Date: Fri, 31 Mar 2023 20:39:32 +0300
+Subject: [PATCH] fix build for master fmt (non-bundled) (#2694)
+
+* fix build for master fmt (non-bundled)
+
+* update fmt_runtime_string macro
+
+* fix build of updated macro
+---
+ include/spdlog/common.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index e69201a81..5f671c5c6 100644
+--- a/include/spdlog/common.h
++++ b/include/spdlog/common.h
+@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>;
+ template<class T>
+ using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+ 
++template <typename Char>
++#if FMT_VERSION >= 90101
++using fmt_runtime_string = fmt::runtime_format_string<Char>;
++#else
++using fmt_runtime_string = fmt::basic_runtime<Char>;
++#endif
++
+ // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
+ // in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char>
+ template<class T, class Char = char>
+ struct is_convertible_to_basic_format_string
+     : std::integral_constant<bool,
+-          std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value>
++          std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value>
+ {};
+ 
+ #    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
diff --git a/spdlog.spec b/spdlog.spec
index de46bb9..12704b7 100644
--- a/spdlog.spec
+++ b/spdlog.spec
@@ -1,6 +1,6 @@
 Name:           spdlog
 Version:        1.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 License:        MIT
 Summary:        Super fast C++ logging library
@@ -9,6 +9,8 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 # https://github.com/gabime/spdlog/pull/2661
 Patch100:       spdlog-catchv3-compatibility.patch
+# https://github.com/gabime/spdlog/pull/2694
+Patch101:       spdlog-fmt10-compatibility.patch
 
 BuildRequires:  catch-devel >= 3.0.0
 BuildRequires:  cmake
@@ -69,6 +71,9 @@ rm -f tests/catch.hpp
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* 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.