Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2015-01-09 20:52:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spamassassin" Changes: -------- --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2014-08-05 13:00:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2015-01-09 20:52:12.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 6 20:21:54 UTC 2015 - [email protected] + +- Fix for boo#911355 +- Don't install init files when service files are installed +- Create symlinks for rcspamd and rcspampd when systemd is used +- Remove unnecessary cleanup section from spec files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.LA7wSo/_old 2015-01-09 20:52:14.000000000 +0100 +++ /var/tmp/diff_new_pack.LA7wSo/_new 2015-01-09 20:52:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,12 +66,6 @@ %{?systemd_requires} %endif -%if %suse_version > 1220 -%define _unitdir /usr/lib/systemd -%else -%define _unitdir /lib/systemd -%endif - %description spamassassin adds a header line that shows if the mail has been determined spam or not. This way, you can decide what to do with the @@ -227,10 +221,15 @@ %{__install} -D -m0755 %{SPAMPD}/spampd.pl $RPM_BUILD_ROOT%{_sbindir}/spampd mv $RPM_BUILD_ROOT%{_bindir}/spamd $RPM_BUILD_ROOT%{_sbindir}/ %{__install} -m 0644 %{S:10} $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf +%if 0%{?suse_version} > 1140 +%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd +%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd +%else %{__install} -D -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/spamd %{__install} -m 0755 %{S:13} $RPM_BUILD_ROOT/etc/init.d/spampd %{__ln_s} ../../etc/init.d/spamd $RPM_BUILD_ROOT/usr/sbin/rcspamd %{__ln_s} ../../etc/init.d/spampd $RPM_BUILD_ROOT/usr/sbin/rcspampd +%endif echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SUSE %{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.spamd %{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT/var/adm/fillup-templates/ @@ -243,17 +242,20 @@ %if 0%{?suse_version} > 1140 ## systemd stuff -mkdir -p $RPM_BUILD_ROOT%{_unitdir}/system -%{__install} -m 644 %{S:16} $RPM_BUILD_ROOT%{_unitdir}/system/ -%{__install} -m 644 %{S:17} $RPM_BUILD_ROOT%{_unitdir}/system/ +mkdir -p %{buildroot}/%{_unitdir} +%{__install} -D -m 644 %{S:16} %{buildroot}/%{_unitdir} +%{__install} -D -m 644 %{S:17} %{buildroot}/%{_unitdir} %endif %post -%{fillup_and_insserv -n spamd} -%{fillup_and_insserv -n spampd} %if %suse_version > 1140 %service_add_post spamd.service %service_add_post spampd.service +%{fillup_only -n spamd} +%{fillup_only -n spampd} +%else +%{fillup_and_insserv -n spamd} +%{fillup_and_insserv -n spampd} %endif %pre @@ -277,24 +279,20 @@ %service_del_postun spampd.service %endif -exit 0 - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc spamd/README* spamd/PROTOCOL %doc %{_mandir}/man1/* -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_sbindir}/* -%config %attr(744,root,root) /etc/init.d/spamd -%config %attr(744,root,root) /etc/init.d/spampd +%{_bindir}/* +%{_sbindir}/* /var/adm/fillup-templates/sysconfig.spamd /var/adm/fillup-templates/sysconfig.spampd %if 0%{?suse_version} > 1140 -%{_unitdir}/system/spamd.service -%{_unitdir}/system/spampd.service +%{_unitdir}/spamd.service +%{_unitdir}/spampd.service +%else +%config %attr(744,root,root) /etc/init.d/spamd +%config %attr(744,root,root) /etc/init.d/spampd %endif %files -n perl-Mail-SpamAssassin -f %{name}.files ++++++ spamd.service ++++++ --- /var/tmp/diff_new_pack.LA7wSo/_old 2015-01-09 20:52:14.000000000 +0100 +++ /var/tmp/diff_new_pack.LA7wSo/_new 2015-01-09 20:52:14.000000000 +0100 @@ -22,7 +22,7 @@ [Service] Type=forking PIDFile=/var/run/spamd.pid -ExecStartPre=-/bin/echo 'Starting spamd:' +ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spamd ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /var/run/spamd.pid ++++++ spampd.service ++++++ --- /var/tmp/diff_new_pack.LA7wSo/_old 2015-01-09 20:52:14.000000000 +0100 +++ /var/tmp/diff_new_pack.LA7wSo/_new 2015-01-09 20:52:14.000000000 +0100 @@ -22,7 +22,7 @@ [Service] Type=forking PIDFile=/var/run/spampd.pid -ExecStartPre=-/bin/echo 'Starting the SpamAssassin Proxy Daemon:' +ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spampd ExecStart=/usr/sbin/spampd $SPAMPD_OPTIONS -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
