rpm/spdlog
SHA256
1
0
Fork 0
forked from pool/spdlog
Code Pull Requests Activity

Accepting request 910461 from devel:libraries:c_c++

Browse Source 
- Add spdlog-1.9.1-use_system_catch2.patch (fixes boo#1189103)

OBS-URL: https://build.opensuse.org/request/show/910461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spdlog?expand=0&rev=21
This commit is contained in:
Richard Brown 2021-08-11 09:47:05 +00:00 committed by Git OBS Bridge
commit 6c67515f16
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
spdlog-1.9.1-use_system_catch2.patch Normal file
View File

@ -0,0 +1,41 @@
Index: spdlog-1.9.1/tests/includes.h
===================================================================
--- spdlog-1.9.1.orig/tests/includes.h
+++ spdlog-1.9.1/tests/includes.h
@@ -1,6 +1,6 @@
#pragma once
-#include "catch.hpp"
+#include <catch2/catch.hpp>
#include "utils.h"
#include <chrono>
#include <cstdio>
@@ -23,4 +23,4 @@
#include "spdlog/sinks/ostream_sink.h"
#include "spdlog/sinks/rotating_file_sink.h"
#include "spdlog/sinks/stdout_color_sinks.h"
-#include "spdlog/pattern_formatter.h"
\ No newline at end of file
+#include "spdlog/pattern_formatter.h"
Index: spdlog-1.9.1/tests/main.cpp
===================================================================
--- spdlog-1.9.1.orig/tests/main.cpp
+++ spdlog-1.9.1/tests/main.cpp
@@ -1,2 +1,2 @@
#define CATCH_CONFIG_MAIN
-#include "catch.hpp"
\ No newline at end of file
+#include <catch2/catch.hpp>
Index: spdlog-1.9.1/tests/CMakeLists.txt
===================================================================
--- spdlog-1.9.1.orig/tests/CMakeLists.txt
+++ spdlog-1.9.1/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ include(../cmake/utils.cmake)
find_package(PkgConfig)
if(PkgConfig_FOUND)
- pkg_check_modules(systemd libsystemd)
+ pkg_check_modules(systemd libsystemd catch2>=2.13.4)
endif()
set(SPDLOG_UTESTS_SOURCES

5
spdlog.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 6 09:42:32 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
- Add spdlog-1.9.1-use_system_catch2.patch (fixes boo#1189103)
-------------------------------------------------------------------
Tue Jul 27 13:31:38 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

3
spdlog.spec
View File

@ -24,6 +24,8 @@ Summary: C++ logging library
License: MIT
URL: https://github.com/gabime/spdlog
Source0: https://github.com/gabime/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE spdlog-1.9.1-use_system_catch2.patch use system catch2 to fix problem with glibc 2.3.4 -- aloisio@gmx.com
Patch0: spdlog-1.9.1-use_system_catch2.patch
BuildRequires: benchmark-devel >= 1.4.0
BuildRequires: cmake >= 3.10
%if 0%{?suse_version} > 1500
@ -33,6 +35,7 @@ BuildRequires: gcc8-c++
%endif
BuildRequires: ninja
BuildRequires: pkgconfig
BuildRequires: pkgconfig(catch2) >= 2.13.4
BuildRequires: pkgconfig(fmt) >= 8.0.0
BuildRequires: pkgconfig(libsystemd)