aboutsummaryrefslogtreecommitdiffstats
path: root/centos
diff options
context:
space:
mode:
Diffstat (limited to 'centos')
-rw-r--r--centos/rspamd.spec11
-rw-r--r--centos/sources/rspamd.service.patch10
2 files changed, 9 insertions, 12 deletions
diff --git a/centos/rspamd.spec b/centos/rspamd.spec
index c3ba247c5..89bc0b087 100644
--- a/centos/rspamd.spec
+++ b/centos/rspamd.spec
@@ -23,7 +23,7 @@ License: BSD2c
URL: https://rspamd.com
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
BuildRequires: glib2-devel,libevent-devel,openssl-devel,pcre-devel
-BuildRequires: cmake,gmime,file-devel,perl-Digest-MD5
+BuildRequires: cmake,gmime-devel,file-devel,perl-Digest-MD5
%if 0%{?suse_version} || 0%{?el7} || 0%{?fedora}
BuildRequires: systemd
Requires(pre): systemd
@@ -181,6 +181,8 @@ fi
%if 0%{?el6}
%{_initrddir}/%{name}
%dir %{_localstatedir}/run/rspamd
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %{rspamd_logdir}
%endif
%{_mandir}/man8/%{name}.*
%{_mandir}/man1/rspamc.*
@@ -200,15 +202,10 @@ fi
%config(noreplace) %{rspamd_confdir}/options.inc
%config(noreplace) %{rspamd_confdir}/redirectors.inc
%config(noreplace) %{rspamd_confdir}/worker-controller.inc
+%config(noreplace) %{rspamd_confdir}/worker-fuzzy.inc
%config(noreplace) %{rspamd_confdir}/worker-normal.inc
%config(noreplace) %{rspamd_confdir}/modules.d/*
%config(noreplace) %{rspamd_confdir}/rspamd.systemd.conf
-%if 0%{?el6}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%endif
-%if 0%{?el6}
-%dir %{rspamd_logdir}
-%endif
%attr(-, _rspamd, _rspamd) %dir %{rspamd_home}
%dir %{rspamd_rulesdir}/regexp
%dir %{rspamd_rulesdir}
diff --git a/centos/sources/rspamd.service.patch b/centos/sources/rspamd.service.patch
index 866a65ee5..6e9c1c57c 100644
--- a/centos/sources/rspamd.service.patch
+++ b/centos/sources/rspamd.service.patch
@@ -1,9 +1,9 @@
---- rspamd.service.orig 2016-03-21 17:21:25.316909188 +0200
-+++ rspamd.service 2016-03-21 17:21:45.377034896 +0200
-@@ -3,8 +3,7 @@
- After=nss-lookup.target
-
+--- rspamd.service.orig 2016-07-06 22:35:44.164819553 +0200
++++ rspamd.service 2016-07-06 22:36:16.665047224 +0200
+@@ -5,8 +5,7 @@
[Service]
+ Type=forking
+ NonBlocking=true
-ExecStart=/usr/bin/rspamd -c /etc/rspamd/rspamd.conf -f
-User=_rspamd
+ExecStart=/usr/bin/rspamd -c /etc/rspamd/rspamd.conf -f -u _rspamd -g _rspamd