From 2086bf119097f29c88eb76a72e9819c6613d4cee Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Wed, 5 Feb 2025 14:16:07 +0100 Subject: [PATCH] automatic version update by autodist [release 1.15.1-1mamba;Tue Feb 04 2025] --- spdlog-1.15.0-libfmt-11.1.1-2.patch | 32 ----------------------------- spdlog.spec | 9 ++++---- 2 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 spdlog-1.15.0-libfmt-11.1.1-2.patch diff --git a/spdlog-1.15.0-libfmt-11.1.1-2.patch b/spdlog-1.15.0-libfmt-11.1.1-2.patch deleted file mode 100644 index be0dd4f..0000000 --- a/spdlog-1.15.0-libfmt-11.1.1-2.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 276ee5f5c0eb13626bd367b006ace5eae9526d8a Mon Sep 17 00:00:00 2001 -From: Rui Chen -Date: Thu, 26 Dec 2024 02:13:57 -0500 -Subject: [PATCH] fix: update to_string_view function for fmt 11.1 (#3301) - -Signed-off-by: Rui Chen ---- - include/spdlog/common.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/include/spdlog/common.h b/include/spdlog/common.h -index aca483c20..2d73f8300 100644 ---- a/include/spdlog/common.h -+++ b/include/spdlog/common.h -@@ -365,10 +365,17 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view - #endif - - #ifndef SPDLOG_USE_STD_FORMAT -+#if FMT_VERSION >= 110100 -+template -+inline fmt::basic_string_view to_string_view(fmt::basic_format_arg fmt) { -+ return fmt; -+} -+#else - template - inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) { - return fmt; - } -+#endif - #elif __cpp_lib_format >= 202207L - template - SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view( diff --git a/spdlog.spec b/spdlog.spec index 18d9459..ba6b5bc 100644 --- a/spdlog.spec +++ b/spdlog.spec @@ -1,6 +1,6 @@ Name: spdlog -Version: 1.15.0 -Release: 2mamba +Version: 1.15.1 +Release: 1mamba Summary: Fast C++ logging library Group: System/Libraries Vendor: openmamba @@ -9,7 +9,6 @@ Packager: Silvan Calarco URL: https://github.com/gabime/spdlog Source: https://github.com/gabime/spdlog.git/v%{version}/spdlog-%{version}.tar.bz2 Patch0: spdlog-1.15.0-libfmt-11.1.1.patch -Patch1: spdlog-1.15.0-libfmt-11.1.1-2.patch License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -45,7 +44,6 @@ This package contains libraries and header files for developing applications tha %prep %setup -q %patch 0 -p1 -b .libfmt-11.1.1 -%patch 1 -p1 -b .libfmt-11.1.1-2 %build %cmake -d build \ @@ -76,6 +74,9 @@ This package contains libraries and header files for developing applications tha %doc README.md %changelog +* Tue Feb 04 2025 Automatic Build System 1.15.1-1mamba +- automatic version update by autodist + * Sun Dec 29 2024 Silvan Calarco 1.15.0-2mamba - rebuilt with libfmt 1.11.1