Accepting request 591815 from home:ippolitov:branches:server:mail

- updated version to 1.7.2
  https://github.com/vstakhov/rspamd/releases/tag/1.7.2
- fix for https://github.com/vstakhov/rspamd/issues/2120 included

OBS-URL: https://build.opensuse.org/request/show/591815
OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=13

rspamd.spec

@@ -14,6 +14,8 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+%{echo: building for suse: ver:%{suse_version} arch:%{_arch} o:%{is_opensuse} "\n"}
+
 %if 0%{?suse_version} > 1230 || 0%{?rhel_version} > 600 || 0%{?centos_version} > 600 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}%{?fc24}%{?fc25}
 %bcond_without systemd
 %else
@@ -21,29 +23,28 @@
 %endif
 
 %ifarch %ix86 
-  %if 0%{?suse_version} < 1500
+  %if 0%{?suse_version} > 1500
     #no luajit and jemallox for i.86 arch before Tumbleweed
-    %bcond_with    luajit
-    %bcond_with    jemalloc
-    %bcond_with    ext_hiredis
-    %bcond_with    torch
+    %bcond_without    luajit
+    %bcond_without    jemalloc
+    %bcond_without    ext_hiredis
+    %bcond_without    torch
   %endif
 %else
+
   %ifarch ppc ppc64 ppc64le
-    %bcond_with    luajit
-    %bcond_with    torch
+    # no jemalloc for PPC builds (either too old, or absent at all)
+    %if 0%{?sle_version} != 150000
+      #no hiredis for SLE_15 on ppc64le
+      %bcond_without    ext_hiredis
+    %endif
   %else
-    # x86_64 has jemallow and hiredis.
-    %bcond_without jemalloc
-    %bcond_without ext_hiredis
-    %if ( 0%{?suse_version} && 0%{suse_version} < 1300 )
-      # older distros don't have luajit and torch requires it
-      %bcond_with    luajit
-      %bcond_with    torch
-    %else
+    %if 0%{?is_opensuse}
       # Leap 43.2 and newer has luajit and may have torch
       %bcond_without    luajit
       %bcond_without    torch
+      %bcond_without    jemalloc
+      %bcond_without    ext_hiredis
     %endif
   %endif
 %endif
@@ -57,7 +58,7 @@
 %global _wwwdir /srv/www/webapps
 
 Name:           rspamd
-Version:        1.7.1
+Version:        1.7.2
 Release:        0
 License:        Apache-2.0
 Summary:        Spam filtering system
@@ -65,7 +66,7 @@ Url:            https://rspamd.com/
 Group:          Productivity/Networking/Email/Utilities
 Source0:        https://github.com/vstakhov/rspamd/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:        rspamd.conf
-Patch0:         lua_util.c.patch
+Patch0:         protocol.c.patch
 
 BuildRequires:  cmake
 BuildRequires:  curl-devel
@@ -161,9 +162,7 @@ simultaneously and has a number of features available.
   %endif
   -DENABLE_DB=ON                            \
   -DENABLE_SQLITE=ON                        \
-  %if %{with ext_hiredis}
   -DENABLE_HIREDIS=ON                       \
-  %endif
   -DENABLE_URL_INCLUDE=ON                   \
   -DNO_SHARED=ON                            \
   -DINSTALL_EXAMPLES=ON                     \