--- rpms/spamassassin/sme9/spamassassin.spec	2015/07/10 06:21:33	1.5
+++ rpms/spamassassin/sme9/spamassassin.spec	2015/07/10 14:26:18	1.6
@@ -2,7 +2,7 @@
 
 Name: spamassassin
 Version: 3.3.2
-Release: 59%{?dist}
+Release: 60%{?dist}
 Summary: Spam filter for email which can be invoked from mail delivery agents
 License: Apache
 Group: Applications/Internet
@@ -30,7 +30,6 @@ Patch1000: Mail-SpamAssassin-3.3.2-updat
 Buildroot: %{_tmppath}/%{name}-root
 Requires(pre): /sbin/chkconfig /sbin/service
 
-BuildRequires: atrpms-rpm-config
 BuildRequires: openssl-devel, krb5-devel
 BuildRequires: autoconf
 BuildRequires: perl >= 2:5.8.1
@@ -145,9 +144,13 @@ To filter spam for all users, add that l
 %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
@@ -256,6 +259,9 @@ 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]