Merge changes from OBS (except for EL6 stuff)

diff --git a/centos/rspamd.spec b/centos/rspamd.spec
index e1da9dbd869db38a7e31de8102ef5cce6727a8d0..9896af3f8a1fb48979cdf9f209ad48dbbc512af6 100644 (file)
--- a/centos/rspamd.spec
+++ b/centos/rspamd.spec
@@ -38,7 +38,11 @@ Requires(pre):  shadow
 BuildRequires:  sqlite-devel
 Requires(pre):  shadow-utils
 %endif
-Requires:       lua
+%if 0%{?fedora_version} >= 22 || 0%{?suse_version} >= 1320
+BuildRequires:  luajit-devel,hiredis-devel
+%else
+BuildRequires:  lua-devel
+%endif
 %if 0%{?el6}
 Requires:       logrotate
 Requires(post): chkconfig
@@ -78,6 +82,13 @@ lua.
 %endif
 %if 0%{?suse_version}
         -DCMAKE_SKIP_INSTALL_RPATH=ON \
+%endif
+%if 0%{?fedora_version} >= 22 || 0%{?suse_version} >= 1320
+               -DENABLE_LUAJIT=ON \
+               -DENABLE_HIREDIS=ON \
+%else
+               -DENABLE_LUAJIT=OFF \
+               -DENABLE_HIREDIS=OFF \
 %endif
         -DLOGDIR=%{_localstatedir}/log/rspamd \
         -DEXAMPLESDIR=%{_datadir}/examples/rspamd \
@@ -316,4 +327,4 @@ fi
 - Update to 0.5.6.
 
 * Sat May 25 2013 Vsevolod Stakhov <vsevolod-at-highsecure.ru> 0.5.5-1
-- Initial spec version.
\ No newline at end of file
+- Initial spec version.