$ git diff --patch-with-stat --summary 88c946ceb7972c76a0cc28b6e23574e1b2b9259d..a0e6d73b3cfdde21bf2b05f6c2fbe24e9bdd0a6a
.abf.yml | 2 +-
rspamd-2.4-clang10.patch | 11 -----------
rspamd.spec | 5 +++--
3 files changed, 4 insertions(+), 14 deletions(-)
delete mode 100644 rspamd-2.4-clang10.patch
diff --git a/.abf.yml b/.abf.yml
index cd18656..98944c7 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- 2.5.tar.gz: e3c3afb0cbdb50763421be73d7d3cab187a8fdb5
+ 2.6.tar.gz: 56622201f414de9d4f06f28e799b22bd699616a0
diff --git a/rspamd-2.4-clang10.patch b/rspamd-2.4-clang10.patch
deleted file mode 100644
index dfc7739..0000000
--- a/rspamd-2.4-clang10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up rspamd-2.4/contrib/replxx/src/io.cxx.omv~ rspamd-2.4/contrib/replxx/src/io.cxx
---- rspamd-2.4/contrib/replxx/src/io.cxx.omv~ 2020-02-27 02:41:24.696258874 +0100
-+++ rspamd-2.4/contrib/replxx/src/io.cxx 2020-02-27 02:42:03.381256997 +0100
-@@ -3,6 +3,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <array>
-+#include <stdexcept>
-
- #ifdef _WIN32
-
diff --git a/rspamd.spec b/rspamd.spec
index 46c6921..a062be3 100644
--- a/rspamd.spec
+++ b/rspamd.spec
@@ -8,7 +8,7 @@
%define rspamd_wwwdir %{_datadir}/rspamd/www
Name: rspamd
-Version: 2.5
+Version: 2.6
Release: 1
Summary: Rapid spam filtering system
Group: System/Servers
@@ -36,7 +36,6 @@ BuildRequires: rpm-helper
Requires(pre,postun): rpm-helper
Source0: https://github.com/vstakhov/rspamd/archive/%{version}.tar.gz
Patch0: rspamd-1.6.5-systemd-user.patch
-Patch1: rspamd-2.4-clang10.patch
Requires: lua-lpeg
%description
@@ -126,6 +125,7 @@ EOF
%{rspamd_confdir}/scores.d/*.conf
%{_sysconfdir}/tmpfiles.d/rspamd.conf
%attr(-,%{rspamd_user},%{rspamd_user}) %dir %{rspamd_home}
+%dir %{rspamd_rulesdir}/controller
%dir %{rspamd_rulesdir}/regexp
%dir %{rspamd_rulesdir}
%dir %{rspamd_confdir}
@@ -134,6 +134,7 @@ EOF
%dir %{rspamd_confdir}/override.d
%dir %{rspamd_pluginsdir}
%dir %{rspamd_wwwdir}
+%{rspamd_rulesdir}/controller/*.lua
%{rspamd_rulesdir}/regexp/*.lua
%{rspamd_rulesdir}/*.lua
%{rspamd_wwwdir}/*