Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2019-11-13 13:13:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spamassassin" Wed Nov 13 13:13:56 2019 rev:79 rq:747349 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2019-11-10 22:15:21.791313786 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new.2990/spamassassin.changes 2019-11-13 13:13:59.446802154 +0100 @@ -0,0 +1,17 @@ +------------------------------------------------------------------- +Sat Nov 9 12:42:47 UTC 2019 - Arjen de Korte <[email protected]> + +- Change architecture of perl modules to 'noarch' + +------------------------------------------------------------------- +Fri Nov 8 10:40:45 UTC 2019 - Arjen de Korte <[email protected]> + +- Fix extraction command for default rules (proper fix for + boo#911355, rather than a workaround) +- Don't unconditionally run sa-update on spamd and spampd service + start as this doesn't honor the settings in /etc/sysconfig/spamd +- After running sa-update, only restart services if they were + running before +- Fix name in logging timed-sa-update (suse.cron-sa-update + doesn't exist anymore) + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.wm1GPl/_old 2019-11-13 13:14:02.958805810 +0100 +++ /var/tmp/diff_new_pack.wm1GPl/_new 2019-11-13 13:14:02.962805814 +0100 @@ -24,6 +24,7 @@ %define ix_version 2.05 %define spd_version 2.53 %define sa_version 3.4.2 +%define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') %define rules_revision 1840640 %define IXHASH iXhash2-%{ix_version} @@ -145,6 +146,7 @@ Recommends: perl(Encode::Detect) Provides: perl-spamassassin = %{sa_version} Obsoletes: perl-spamassassin < %{sa_version} +BuildArch: noarch %{perl_requires} %description -n perl-Mail-SpamAssassin @@ -161,6 +163,7 @@ Release: 0 Provides: perl-Mail-SpamAssassin-Plugin-iXhash = %{ix_version} Obsoletes: perl-Mail-SpamAssassin-Plugin-iXhash < 2 +BuildArch: noarch %{perl_requires} %description -n perl-Mail-SpamAssassin-Plugin-iXhash2 @@ -175,6 +178,7 @@ %prep %setup -q -n Mail-SpamAssassin-%{sa_version} -a 2 -a 3 +tar -zxf %{S:1} -C rules %patch1 -p0 %patch2 -p1 %patch3 -p0 @@ -197,7 +201,7 @@ perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \ CONTACT_ADDRESS="postmaster" ENABLE_SSL="yes" -make +make %{?_smp_mflags} %check # fails now... FIGURE out why @@ -232,8 +236,13 @@ echo "MakeMaker is broken again..." exit 1 } -install -d %{buildroot}/usr/share/spamassassin -pushd %{buildroot}/usr/share/spamassassin && tar -xjf %{S:1} && popd + +## default rules +install -d %{buildroot}%{_datadir}/spamassassin +install -D -m 0644 rules/[0-9]*.cf %{buildroot}%{_datadir}/spamassassin +sed -i -e 's|@@CONTACT_ADDRESS@@|postmaster|g' \ + -e 's|@@LOCAL_RULES_DIR@@|/etc/mail/spamassassin|g' \ + -e 's|@@VERSION@@|%{sa_float}|g' %{buildroot}%{_datadir}/spamassassin/*.cf ## systemd stuff mkdir -p %{buildroot}/%{_unitdir} @@ -278,8 +287,9 @@ %dir /etc/mail %config(noreplace) /etc/mail/spamassassin %exclude /etc/mail/spamassassin/iXhash2.cf -%dir /usr/share/spamassassin -/usr/share/spamassassin/* +%exclude %{perl_vendorarch} +%dir %{_datadir}/spamassassin +%{_datadir}/spamassassin/* %files -n perl-Mail-SpamAssassin-Plugin-iXhash2 %defattr(-,root,root) ++++++ spamd.service ++++++ --- /var/tmp/diff_new_pack.wm1GPl/_old 2019-11-13 13:14:03.086805944 +0100 +++ /var/tmp/diff_new_pack.wm1GPl/_new 2019-11-13 13:14:03.090805947 +0100 @@ -22,7 +22,6 @@ [Service] Type=forking PIDFile=/run/spamd.pid -ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spamd ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /run/spamd.pid ExecReload=/usr/bin/kill -HUP $MAINPID ++++++ spampd.service ++++++ --- /var/tmp/diff_new_pack.wm1GPl/_old 2019-11-13 13:14:03.110805968 +0100 +++ /var/tmp/diff_new_pack.wm1GPl/_new 2019-11-13 13:14:03.114805973 +0100 @@ -22,7 +22,6 @@ [Service] Type=forking PIDFile=/run/spampd.pid -ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spampd ExecStart=/usr/sbin/spampd $SPAMPD_OPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID ++++++ timed-sa-update ++++++ --- /var/tmp/diff_new_pack.wm1GPl/_old 2019-11-13 13:14:03.154806014 +0100 +++ /var/tmp/diff_new_pack.wm1GPl/_new 2019-11-13 13:14:03.154806014 +0100 @@ -23,21 +23,21 @@ fi if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then - /sbin/service spamd restart &> /dev/null + /sbin/service spamd try-restart &> /dev/null fi if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then - /sbin/service amavis restart &> /dev/null + /sbin/service amavis try-restart &> /dev/null fi if [ $result = 2 ] ; then echo "sa-update lint check failed" | \ - logger -t suse.cron-sa-update + logger -t timed-sa-update fi if [ $result -ge 3 ] ; then echo "sa-update failed, exitcode $result" | \ - logger -t suse.cron-sa-update + logger -t timed-sa-update fi fi exit 0
