Compare commits

..

No commits in common. "rawhide" and "f37" have entirely different histories.
rawhide ... f37

5 changed files with 28 additions and 78 deletions

23
.gitignore vendored
View File

@ -1 +1,22 @@
/spdlog-*.tar.gz
/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
/v1.3.1.tar.gz
/v1.4.2.tar.gz
/v1.5.0.tar.gz
/v1.6.1.tar.gz
/v1.7.0.tar.gz
/v1.8.0.tar.gz
/v1.8.1.tar.gz
/v1.8.2.tar.gz
/v1.8.5.tar.gz
/v1.9.0.tar.gz
/v1.9.1.tar.gz
/v1.9.2.tar.gz
/v1.10.0.tar.gz
/spdlog-1.11.0.tar.gz

View File

@ -1 +1 @@
SHA512 (spdlog-1.12.0.tar.gz) = db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d
SHA512 (spdlog-1.11.0.tar.gz) = 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412

View File

@ -1,22 +0,0 @@
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_);
}
}

View File

@ -1,23 +0,0 @@
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");

View File

@ -1,20 +1,15 @@
Name: spdlog
Version: 1.12.0
Release: 2%{?dist}
Version: 1.11.0
Release: 1%{?dist}
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: catch-devel >= 2.8.0
BuildRequires: cmake
BuildRequires: fmt-devel >= 9.1.0
BuildRequires: fmt-devel >= 8.1.1
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: google-benchmark-devel
@ -38,7 +33,7 @@ applications that use %{name}.
%autosetup -p1
find . -name '.gitignore' -delete
sed -e "s,\r,," -i README.md
rm -f tests/catch.hpp
ln -svf %{_includedir}/catch2/catch.hpp ./tests/catch.hpp
%build
%cmake -G Ninja \
@ -71,27 +66,6 @@ rm -f tests/catch.hpp
%{_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.