Cleaned up spec, added conditionals to build on el again.

This commit is contained in:
Kevin Fenzi 2014-03-19 10:27:23 -06:00
parent 889c0badad
commit 60768d6148
2 changed files with 11 additions and 1 deletions

View File

@ -69,7 +69,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin
Version: 3.4.0
#Release: 0.8.%{prerev}%{?dist}
Release: 2%{?dist}
Release: 3%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: http://spamassassin.apache.org/
@ -92,6 +92,7 @@ Source13: README.RHEL.Fedora
%if %{use_systemd}
Source14: spamassassin.service
%endif
Source15: spamassassin.sysconfig.el
# Patches 0-99 are RH specific
# https://bugzilla.redhat.com/show_bug.cgi?id=1055593
# Switch to using gnupg2 instead of gnupg1
@ -203,7 +204,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/local.cf
%if %{use_systemd}
install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/spamassassin
%else
install -m644 %{SOURCE15} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/spamassassin
%endif
install -m 0644 %{SOURCE3} %buildroot/etc/mail/spamassassin
install -m 0644 %{SOURCE4} %buildroot/etc/mail/spamassassin
@ -365,6 +370,9 @@ fi
%endif
%changelog
* Wed Mar 19 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-3
- Cleaned up spec, added conditionals to build on el again.
* Sun Feb 16 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-2
- Simplify systemd unit file. Thanks misc. Fixes bug #1065762

View File

@ -0,0 +1,2 @@
# Options to spamd
SPAMDOPTIONS="-d -c -m5 -H"