pool/rspamd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- switch to autosetup, all target distros are new enough

Browse Source 
- backport https://github.com/rspamd/rspamd/commit/309bb213cf.patch 
  to actually make it use system fmt

OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=66
This commit is contained in:
Marcus Rückert 2021-09-17 21:24:27 +00:00 committed by Git OBS Bridge
parent e8d15fc946
commit b71e5fcfdd
3 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
309bb213cf.patch Normal file
View File

@ -0,0 +1,45 @@
From 309bb213cffb23e6bee98157b53cf5db31f97ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
Date: Sat, 21 Aug 2021 11:24:35 +0200
Subject: [PATCH] Add SYSTEM_FMT cmake option
This gives packagers option to use system version of fmt rather than
bundled one. It is disabled by default.
---
CMakeLists.txt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c38758f3..fc4175677 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,7 @@ OPTION(ENABLE_LIBUNWIND "Use libunwind to print crash traces [default: OFF]"
OPTION(ENABLE_LUA_TRACE "Trace all Lua C API invocations [default: OFF]" OFF)
OPTION(ENABLE_LUA_REPL "Enables Lua repl (requires C++11 compiler) [default: ON]" ON)
OPTION(SYSTEM_ZSTD "Use system zstd instead of bundled one [default: OFF]" OFF)
+OPTION(SYSTEM_FMT "Use system fmt instead of bundled one [defalut: OFF]" OFF)
############################# INCLUDE SECTION #############################################
@@ -117,7 +118,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
"${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
"${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
"${CMAKE_SOURCE_DIR}/contrib/frozen/include"
- "${CMAKE_SOURCE_DIR}/contrib/fmt/include"
"${CMAKE_SOURCE_DIR}/contrib/doctest"
"${CMAKE_SOURCE_DIR}/contrib/fu2/include"
"${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
@@ -650,7 +650,12 @@ ADD_SUBDIRECTORY(contrib/libev)
ADD_SUBDIRECTORY(contrib/kann)
ADD_SUBDIRECTORY(contrib/fastutf8)
ADD_SUBDIRECTORY(contrib/google-ced)
-ADD_SUBDIRECTORY(contrib/fmt)
+IF(SYSTEM_FMT MATCHES "OFF")
+ ADD_SUBDIRECTORY(contrib/fmt)
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/fmt/include")
+ELSE()
+ find_package(fmt)
+ENDIF()
ADD_SUBDIRECTORY(contrib/doctest)
IF (NOT WITH_LUAJIT)

11
rspamd.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Sep 17 21:18:15 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
- switch to autosetup, all target distros are new enough
-------------------------------------------------------------------
Fri Sep 17 21:17:54 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
- backport https://github.com/rspamd/rspamd/commit/309bb213cf.patch
to actually make it use system fmt
-------------------------------------------------------------------
Fri Sep 17 20:42:24 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>

5
rspamd.spec
View File

@ -67,6 +67,7 @@ Source0: https://github.com/rspamd/rspamd/archive/%{version}/%{name}-%{ve
Source1: usr.bin.rspamd
Patch0: rspamd-conf.patch
Patch1: rspamd-after-redis-target.patch
Patch2: https://github.com/rspamd/rspamd/commit/309bb213cf.patch
# PATCH-FIX-UPSTREAM - https://github.com/rspamd/rspamd/issues/3656
%if !0%{?is_opensuse}
# because 80-check-malware-scan-clamav triggered in SLE-15-SP2
@ -164,9 +165,7 @@ This package holds the client tools (rspamc and rspamadm)
%endif
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%autosetup -p1
%build
%if 0%{?force_gcc_version}