--- rpms/spamassassin/sme9/spamassassin.spec	2015/07/09 20:23:50	1.2
+++ rpms/spamassassin/sme9/spamassassin.spec	2015/07/10 14:26:18	1.6
@@ -2,7 +2,7 @@
 
 Name: spamassassin
 Version: 3.3.2
-Release: 57%{?dist}
+Release: 60%{?dist}
 Summary: Spam filter for email which can be invoked from mail delivery agents
 License: Apache
 Group: Applications/Internet
@@ -26,6 +26,7 @@ Source50: http://www.apache.org/dist/spa
 Source60: GPG-sought.KEY
 Patch0: Mail-SpamAssassin-3.0.0-krb5.patch
 #Patch1: sa-1027163-for-3.3.diff
+Patch1000: Mail-SpamAssassin-3.3.2-update_RegistrarBoundaries.patch
 Buildroot: %{_tmppath}/%{name}-root
 Requires(pre): /sbin/chkconfig /sbin/service
 
@@ -138,13 +139,18 @@ To filter spam for all users, add that l
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p1 -b .krb5
 #patch1 -p0 -b .goto
+%patch1000 -p1
 
 %build
 (cd spamc; autoconf)
 %define _perl_buildroot %{nil}
-%perl_configure ENABLE_SSL=yes
-%perl_make
-%perl_makecheck || :
+test -z "$CFLAGS" && export CFLAGS="%{optflags}"
+%{__perl} Makefile.PL 'PREFIX=%{_perl_buildroot}%{_prefix}' INSTALLDIRS=vendor ENABLE_SSL=yes
+%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%if %{?_without_check:0}%{!?_without_check:1}
+%{__make} test ||:
+%endif
 mv spamd/README spamd/README.spamd
 
 %install
@@ -253,6 +259,16 @@ fi
 exit 0
 
 %changelog
+* Fri Jul 10 2015 Daniel Berteaud <daniel@firewall-services.com> - 3.3.2-60.sme
+- Expand atrpms macro and remove BuildReq on atrpms-rpm-config [SME: 8980]
+
+* Fri Jul 10 2015 Daniel Berteaud <daniel@firewall-services.com> - 3.3.2-59.sme
+- Add atrpms-rpm-config to the BUildReq so it can build [SME: 8980]
+
+* Thu Jul 9 2015 Daniel Berteaud <daniel@firewall-services.com> - 3.3.2-58.sme
+- Update RegistrarBoundaries.pm to the one from 3.4.1 so URIBL tests are
+  done on new tld [SME: 8980] 
+
 * Thu Jul 9 2015 Daniel Berteaud <daniel@firewall-services.com> - 3.3.2-57.sme
 - Remove dependency on atrpms macros [SME: 8980]