diff --git a/rspamd.changes b/rspamd.changes index 133ee48..5832544 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,4 +1,17 @@ +------------------------------------------------------------------- +Fri Jul 13 16:09:32 UTC 2018 - mrueckert@suse.de + +- we had a buildrequires for libfann but the cmake flag was in a + conditional. removed the conditional. +- enable pcre2 support +- prepare building utils but they are broken atm +- enable hyperscan for TW and newer +- enable openblas for 15.0 and newer +- gd library had a BR but was not enabled + +------------------------------------------------------------------- Wed Jun 20 12:00:00 UTC 2018 - iippolitov@gmail.com + - changed default configuration to match current rules https://rspamd.com/doc/workers/ diff --git a/rspamd.spec b/rspamd.spec index 45bfeaf..ff6f3fb 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -22,7 +22,7 @@ %bcond_with systemd %endif -%ifarch %ix86 +%ifarch %ix86 %if 0%{?suse_version} > 1500 #no luajit and jemallox for i.86 arch before Tumbleweed %bcond_without luajit @@ -52,6 +52,23 @@ %bcond_with luajit %bcond_with torch +%ifarch %{ix86} x86_64 + %if 0%{?suse_version} > 1500 + %bcond_without hyperscan + %else + %bcond_with hyperscan + %endif +%endif + +%if 0%{?suse_version} >= 1500 + %bcond_without openblas +%else + %bcond_with openblas +%endif + +# fails to build atm +%bcond_with utils + %define rspamd_user _rspamd %define rspamd_group %{rspamd_user} @@ -73,6 +90,9 @@ BuildRequires: db-devel BuildRequires: file-devel BuildRequires: gcc-c++ BuildRequires: gd-devel +%if %{with hyperscan} +BuildRequires: hyperscan-devel +%endif %if %{with jemalloc} BuildRequires: jemalloc-devel %endif @@ -83,7 +103,12 @@ BuildRequires: luajit-devel %else BuildRequires: lua-devel %endif +%if %{with openblas} +BuildRequires: libopenblas_openmp-devel +BuildRequires: openblas-devel +%endif BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) >= 2.28 %if %{with ext_hiredis} @@ -174,12 +199,12 @@ simultaneously and has a number of features available. %if %{with hyperscan} -DENABLE_HYPERSCAN=ON \ %endif - %if %{with fann} + -DENABLE_GD=ON \ -DENABLE_FANN=ON \ + %if %{with utils} + -DENABLE_UTILS=ON \ %endif - %if %{with pcre2} -DENABLE_PCRE2=ON \ - %endif %if %{with jemalloc} -DENABLE_JEMALLOC=ON \ %endif