aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-09-17 20:29:14 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-09-17 20:29:14 +0100
commit5fd604049a3e94dbe66282ee861c0a23e95b1bc4 (patch)
tree332323b501142109851f1a02c02cc5ad29219bd2
parent8540372d32f6015fe1bf8e9354ff1e22b6cc5d1c (diff)
parent03dcbdaa9f68d56ed2c769fba4640489ba215fc3 (diff)
downloadrspamd-5fd604049a3e94dbe66282ee861c0a23e95b1bc4.tar.gz
rspamd-5fd604049a3e94dbe66282ee861c0a23e95b1bc4.zip
Merge pull request #371 from fatalbanana/master
Merge changes from OBS (except for EL6 stuff)
-rw-r--r--centos/rspamd.spec15
1 files changed, 13 insertions, 2 deletions
diff --git a/centos/rspamd.spec b/centos/rspamd.spec
index e1da9dbd8..9896af3f8 100644
--- 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
@@ -79,6 +83,13 @@ lua.
%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 \
-DPLUGINSDIR=%{_datadir}/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.