CLean up portreserve conditionals. Fixes bug #1128708

This commit is contained in:
Kevin Fenzi 2014-08-26 10:54:57 -06:00
parent 9d455c1ef2
commit 6c22dd483f

View File

@ -44,12 +44,6 @@
%define require_encode_detect 1 %define require_encode_detect 1
%endif %endif
%if 0%{?fedora} >= 10
# We use portreserve to prevent our TCP port being stolen.
# Require the package here so that we know /etc/portreserve/ exists.
Requires: portreserve
%endif
# Mail::DKIM by default (F11+) # Mail::DKIM by default (F11+)
%if 0%{?fedora} >= 11 %if 0%{?fedora} >= 11
%define dkim_deps 1 %define dkim_deps 1
@ -69,7 +63,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin Name: spamassassin
Version: 3.4.0 Version: 3.4.0
#Release: 0.8.%{prerev}%{?dist} #Release: 0.8.%{prerev}%{?dist}
Release: 9%{?dist} Release: 10%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Applications/Internet Group: Applications/Internet
URL: http://spamassassin.apache.org/ URL: http://spamassassin.apache.org/
@ -277,6 +271,7 @@ install -m 0644 %{SOURCE13} $RPM_BUILD_DIR/Mail-SpamAssassin-%{version}/
%config(noreplace) %{_sysconfdir}/mail/spamassassin %config(noreplace) %{_sysconfdir}/mail/spamassassin
%config(noreplace) %{_sysconfdir}/sysconfig/spamassassin %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin
%config(noreplace) %{_sysconfdir}/sysconfig/sa-update %config(noreplace) %{_sysconfdir}/sysconfig/sa-update
%dir %{_sysconfdir}/portreserve
%{_sysconfdir}/cron.d/sa-update %{_sysconfdir}/cron.d/sa-update
%dir %{_datadir}/spamassassin %dir %{_datadir}/spamassassin
%dir %{_localstatedir}/run/spamassassin %dir %{_localstatedir}/run/spamassassin
@ -374,6 +369,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Aug 26 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-10
- CLean up portreserve conditionals. Fixes bug #1128708
* Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 3.4.0-9 * Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 3.4.0-9
- Rebuild for rpm bug 1131960 - Rebuild for rpm bug 1131960