From 59ed81b2859f218d07dd5e32800750377d315b3664bed5f81bccf6cbbe8f804a Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 2 Jun 2021 00:20:20 +0000 Subject: [PATCH 1/2] - disable PCRE2 for now: https://bugzilla.opensuse.org/show_bug.cgi?id=1182864#c10 OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=59 --- rspamd.changes | 6 ++++++ rspamd.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rspamd.changes b/rspamd.changes index e60ecbb..f9e9990 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 2 00:19:41 UTC 2021 - Marcus Rueckert + +- disable PCRE2 for now: + https://bugzilla.opensuse.org/show_bug.cgi?id=1182864#c10 + ------------------------------------------------------------------- Tue Mar 2 11:04:58 UTC 2021 - Guillaume GARDET diff --git a/rspamd.spec b/rspamd.spec index f92a6a2..21acd36 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -41,7 +41,7 @@ %if 0%{?suse_version} >= 1500 %bcond_without openblas - %bcond_without pcre2 + %bcond_with pcre2 %endif # fails to build atm From 61c9abc6622385afe7d14a3aa5895b10b98f87f7e773076e5965a01c98d46ca4 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 2 Jun 2021 13:56:02 +0000 Subject: [PATCH 2/2] - use systemd_ordering - add Requires(pre) to shadow to fix %pre scriptlet OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=60 --- rspamd.changes | 10 ++++++++++ rspamd.spec | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/rspamd.changes b/rspamd.changes index f9e9990..171ea5f 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jun 2 13:55:50 UTC 2021 - Marcus Rueckert + +- use systemd_ordering + +------------------------------------------------------------------- +Wed Jun 2 13:55:08 UTC 2021 - Marcus Rueckert + +- add Requires(pre) to shadow to fix %pre scriptlet + ------------------------------------------------------------------- Wed Jun 2 00:19:41 UTC 2021 - Marcus Rueckert diff --git a/rspamd.spec b/rspamd.spec index 21acd36..f6c3c67 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -114,7 +114,7 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(sqlite3) %if %{with systemd} BuildRequires: pkgconfig(systemd) -%{?systemd_requires} +%{?systemd_ordering} %endif %if 0%{?suse_version} < 1500 @@ -129,6 +129,7 @@ Conflicts: rspamd-client %endif BuildRequires: apparmor-abstractions Requires: apparmor-abstractions +Requires(pre): shadow %description Rspamd is a spam filtering system that allows evaluation of messages