[spamassassin] CLean up portreserve conditionals. Fixes bug #1128708

Kevin Fenzi kevin at fedoraproject.org
Tue Aug 26 16:54:56 UTC 2014


commit 6c22dd483f5deb854a46e827c651eec4ebfde0e6
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Aug 26 10:54:57 2014 -0600

    CLean up portreserve conditionals. Fixes bug #1128708

 spamassassin.spec |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/spamassassin.spec b/spamassassin.spec
index 9a46690..c58c3b9 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -44,12 +44,6 @@
 %define require_encode_detect 1
 %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+)
 %if 0%{?fedora} >= 11
 %define dkim_deps 1
@@ -69,7 +63,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: 9%{?dist}
+Release: 10%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 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}/sysconfig/spamassassin
 %config(noreplace) %{_sysconfdir}/sysconfig/sa-update
+%dir %{_sysconfdir}/portreserve
 %{_sysconfdir}/cron.d/sa-update
 %dir %{_datadir}/spamassassin
 %dir %{_localstatedir}/run/spamassassin
@@ -374,6 +369,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 26 2014 Kevin Fenzi <kevin at scrye.com> 3.4.0-10
+- CLean up portreserve conditionals. Fixes bug #1128708
+
 * Thu Aug 21 2014 Kevin Fenzi <kevin at scrye.com> - 3.4.0-9
 - Rebuild for rpm bug 1131960
 


More information about the scm-commits mailing list