--- rpms/spamassassin/sme9/spamassassin.spec 2015/07/09 20:31:01 1.3 +++ rpms/spamassassin/sme9/spamassassin.spec 2015/07/10 15:22:41 1.7 @@ -2,7 +2,7 @@ Name: spamassassin Version: 3.3.2 -Release: 58%{?dist} +Release: 60%{?dist} Summary: Spam filter for email which can be invoked from mail delivery agents License: Apache Group: Applications/Internet @@ -144,14 +144,21 @@ 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 "$PERL5LIB" && export PERL5LIB=%{buildroot}%{perl_vendorarch}:%{buildroot}%{perl_vendorlib} || \ + export PERL5LIB="$PERL5LIB":%{buildroot}%{perl_vendorarch}:%{buildroot}%{perl_vendorlib} +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 rm -rf %{buildroot} -%perl_makeinstall DESTDIR=%{buildroot} +%{__make} install DESTDIR_REDIRECT=%{buildroot} DESTDIR=%{buildroot} +find %{buildroot} \( -name .packlist -or -name perllocal.pod -or \( -name '*.bs' -a -empty \) \) -exec rm -f {} \; install -d %{buildroot}/%{_initrddir} install -p -m 0755 spamd/redhat-rc-script.sh %{buildroot}/%{_initrddir}/spamassassin @@ -195,8 +202,8 @@ mkdir -p %{buildroot}/var/lib/spamassass %{perl_vendorlib}/Mail/SpamAssassin.pm %{perl_vendorlib}/Mail/SpamAssassin -%{perl_man3dir}/Mail::SpamAssassin*.3pm* -%{perl_man1dir}/sa-awl.1* +%{_mandir}/man3/Mail::SpamAssassin*.3pm* +%{_mandir}/man1/sa-awl.1* %{perl_vendorlib}/spamassassin-run.pod %{_datadir}/spamassassin @@ -255,6 +262,12 @@ fi exit 0 %changelog +* Fri Jul 10 2015 Daniel Berteaud - 3.3.2-60.sme +- Expand atrpms macro and remove BuildReq on atrpms-rpm-config [SME: 8980] + +* Fri Jul 10 2015 Daniel Berteaud - 3.3.2-59.sme +- Add atrpms-rpm-config to the BUildReq so it can build [SME: 8980] + * Thu Jul 9 2015 Daniel Berteaud - 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]