From ec085de3a0899bca0e84c4792bc8abca013cbd05 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sep 20 2018 22:06:30 +0000
Subject: Misc small bug fixes and cleanups.


---

diff --git a/spamassassin.spec b/spamassassin.spec
index 846edd1..9f92be8 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -70,7 +70,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.4.2
 #Release: 0.8.%%{prerev}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: https://spamassassin.apache.org/
@@ -88,7 +88,6 @@ Source8: sa-update.cronscript
 Source9: sa-update.force-sysconfig
 Source10: spamassassin-helper.sh
 Source11: spamassassin-official.conf
-Source12: sought.conf
 Source13: README.RHEL.Fedora
 %if %{use_systemd}
 Source14: spamassassin.service
@@ -118,6 +117,15 @@ BuildRequires: perl(Time::HiRes)
 BuildRequires: perl(HTML::Parser)
 BuildRequires: perl(NetAddr::IP)
 BuildRequires: openssl-devel
+# These are here for config checking, they are only really needed as Requires (runtime)
+BuildRequires: perl(DB_File)
+BuildRequires: perl(Mail::SPF)
+BuildRequires: perl(Net::CIDR::Lite)
+BuildRequires: perl(LWP::UserAgent)
+BuildRequires: perl(Digest::SHA1)
+BuildRequires: perl(Test::More)
+# Fedora package needs fixing before we can depend on it
+#BuildRequires: re2c
 %if %{use_systemd}
 BuildRequires: systemd-units
 %endif
@@ -128,12 +136,15 @@ Requires: perl(Net::DNS)
 Requires: perl(Time::HiRes)
 Requires: perl(DB_File)
 Requires: perl(Mail::SPF)
+Requires: perl(Net::CIDR::Lite)
 %if %{require_encode_detect}
 Requires: perl(Encode::Detect)
 %endif
 Requires: perl(BSD::Resource)
 Requires: procmail
 Requires: gnupg2
+# Fedora package needs fixing before we can depend on it
+#Requires: re2c
 
 # Hard requirements
 BuildRequires: perl-HTML-Parser >= 3.43
@@ -144,16 +155,20 @@ Requires: perl(Archive::Tar)
 # Optional requirements that might make things better/faster
 %if %{patricia_deps}
 Requires: perl(Net::Patricia)
+BuildRequires: perl(Net::Patricia)
 %endif
 %if %{razor_deps}
 Requires: perl-Razor-Agent
+BuildRequires: perl-Razor-Agent
 %endif
 
 %if %{option_ssl}
 # Needed for spamc/spamd SSL
 Requires: perl(IO::Socket::SSL)
+BuildRequires: perl(IO::Socket::SSL)
 # Needed for IPv6
 Requires: perl(IO::Socket::INET6)
+BuildRequires: perl(IO::Socket::INET6)
 %endif
 %if %{perl_devel}
 BuildRequires: perl-devel
@@ -161,6 +176,7 @@ BuildRequires: perl-devel
 # Mail::DKIM for F12+, works from RHEL5+ from EPEL5 but we don't require them
 %if %{dkim_deps}
 Requires: perl(Mail::DKIM)
+BuildRequires: perl(Mail::DKIM)
 %endif
 
 %if %{use_systemd}
@@ -210,7 +226,7 @@ echo "RHEL=%{rhel} FEDORA=%{fedora}"
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="%{build_ldflags}"
-%{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null
+%{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL="yes" < /dev/null
 %{__make} OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
@@ -285,7 +301,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
 mkdir   -m 0700             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/
 mkdir   -m 0755             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
 install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
-install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
 
 install -m 0644 %{SOURCE13} $RPM_BUILD_DIR/Mail-SpamAssassin-%{version}/
 %if %{razor_deps}
@@ -383,6 +398,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 20 2018 Kevin Fenzi <kevin@scrye.com> - 3.4.2-2
+- Misc small bug fixes and cleanups.
+
 * Sun Sep 16 2018 Kevin Fenzi <kevin@scrye.com> - 3.4.2-1
 - Update to 3.4.2
 - Fixes: CVE-2017-15705, CVE-2016-1238, CVE-2018-11780 & CVE-2018-11781