Hello community, here is the log from the commit of package amavisd-new for openSUSE:Factory checked in at 2013-11-15 13:12:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old) and /work/SRC/openSUSE:Factory/.amavisd-new.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amavisd-new" Changes: -------- --- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes 2013-10-23 13:11:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 2013-11-15 13:12:14.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 12 13:40:03 UTC 2013 - [email protected] + +- Add real systemd support; add required macros in %post/postun sections + and drop sysvinit support on openSUSE >= 12.3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.eRFL5M/_old 2013-11-15 13:12:15.000000000 +0100 +++ /var/tmp/diff_new_pack.eRFL5M/_new 2013-11-15 13:12:15.000000000 +0100 @@ -79,12 +79,6 @@ %define avuser vscan %define avgroup vscan -%if %suse_version > 1220 -%define _unitdir /usr/lib/systemd -%else -%define _unitdir /lib/systemd -%endif - %description Amavisd-new is a high-performance interface between mailer (MTA) and content checkers: virus scanners or SpamAssassin. It talks to the MTA @@ -135,14 +129,13 @@ # --------------------------------------------------------------------------- %install -mkdir -p $RPM_BUILD_ROOT/%{avquarantine} -mkdir -p $RPM_BUILD_ROOT/%{avspool}/{tmp,var} -mkdir -p $RPM_BUILD_ROOT/%{avdb} -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} +mkdir -p $RPM_BUILD_ROOT%{avquarantine} +mkdir -p $RPM_BUILD_ROOT%{avspool}/{tmp,var} +mkdir -p $RPM_BUILD_ROOT%{avdb} +mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema -mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} +mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib} mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d install -m 644 $RPM_SOURCE_DIR/sysconfig.amavis $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 755 amavisd $RPM_BUILD_ROOT/%{_sbindir}/amavisd @@ -151,13 +144,18 @@ install -m 755 amavisd-release $RPM_BUILD_ROOT/%{_sbindir}/amavisd-release install -m 755 p0f-analyzer.pl $RPM_BUILD_ROOT/%{_sbindir}/p0f-analyzer.pl install -m 644 amavisd.conf $RPM_BUILD_ROOT/etc/amavisd.conf -install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/amavis -ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis install -m 644 LDAP.schema $RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm -mkdir -p $RPM_BUILD_ROOT%{_unitdir}/system %if 0%{?suse_version} > 1140 -install -m 644 %{S:5} $RPM_BUILD_ROOT%{_unitdir}/system/ +mkdir -p $RPM_BUILD_ROOT%{_unitdir} +install -m 644 %{S:5} $RPM_BUILD_ROOT%{_unitdir} +%endif +%if 0%{?suse_version} < 1230 +mkdir -p $RPM_BUILD_ROOT/etc/init.d +install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/amavis +ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis +%else +ln -s ../../sbin/service $RPM_BUILD_ROOT/%{_sbindir}/rcamavis %endif install -m 755 %{S:6} $RPM_BUILD_ROOT/usr/sbin/ cd amavisd-milter @@ -169,12 +167,27 @@ /usr/sbin/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" -d %{avspool} %{avuser} 2> /dev/null || : /usr/sbin/usermod %{avuser} -g %{avgroup} 2> /dev/null || : %{logmsg} "Added user %{avuser} for package %{name}" +%if 0%{?suse_version} > 1140 +%service_add_pre amavis.service +%endif %preun +%if 0%{?suse_version} < 1230 %stop_on_removal amavis +%endif +%if 0%{?suse_version} > 1140 +%service_del_preun amavis.service +%endif %post +%if 0%{?suse_version} < 1230 %{fillup_and_insserv -n amavis amavis} +%else +%fillup_only +%endif +%if 0%{?suse_version} > 1140 +%service_add_post amavis.service +%endif # Update ? if [ ${1:-0} -gt 1 ]; then : OK currently nothing to do @@ -193,8 +206,13 @@ fi %postun +%if 0%{?suse_version} < 1230 %restart_on_update amavis %{insserv_cleanup} +%endif +%if 0%{?suse_version} > 1140 +%service_del_postun amavis.service +%endif %files %defattr(-,root,root) @@ -203,14 +221,16 @@ %dir /etc/openldap %dir /etc/openldap/schema %dir /usr/lib/tmpfiles.d +%if 0%{?suse_version} < 1230 %config /etc/init.d/amavis +%endif %config(noreplace) /etc/amavisd.conf %config(noreplace) /etc/openldap/schema/amavisd-new.schema /var/adm/fillup-templates/sysconfig.amavis %{_sbindir}/* %{perl_vendorlib}/JpegTester.pm %if 0%{?suse_version} > 1140 -%config %{_unitdir}/system/amavis.service +%{_unitdir}/amavis.service /usr/sbin/amavisd-milter.sh %endif %defattr(0750,%{avuser},%{avgroup}, 0750) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
