Hello community, here is the log from the commit of package amavisd-new for openSUSE:Factory checked in at 2019-04-01 12:39:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old) and /work/SRC/openSUSE:Factory/.amavisd-new.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amavisd-new" Mon Apr 1 12:39:59 2019 rev:69 rq:690199 version:2.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes 2018-10-23 20:37:18.136765667 +0200 +++ /work/SRC/openSUSE:Factory/.amavisd-new.new.25356/amavisd-new.changes 2019-04-01 12:40:00.181962326 +0200 @@ -1,0 +2,9 @@ +Sun Mar 17 20:55:56 UTC 2019 - Jan Engelhardt <[email protected]> + +- Mark build recipe as bash-specific. +- Do not hide errors from useradd. +- Remove pre-openSUSE-12.3 logic. +- Convert PreReq and rebuild Requires(pre/post) lists. +- Remove hard scriptlet dependency on systemd. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.fi5hZe/_old 2019-04-01 12:40:00.985962716 +0200 +++ /var/tmp/diff_new_pack.fi5hZe/_new 2019-04-01 12:40:00.985962716 +0200 @@ -1,7 +1,7 @@ # # spec file for package amavisd-new # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,6 +20,7 @@ %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates %endif +%define _buildshell /bin/bash %define avspool /var/spool/amavis %define avdb /var/spool/amavis/db @@ -72,20 +73,6 @@ Requires: smtp_daemon Requires: spamassassin Requires: zoo -PreReq: coreutils -PreReq: net-tools -PreReq: pwdutils -%if 0%{?suse_version} < 1230 -PreReq: %insserv_prereq -%endif -PreReq: util-linux -%if 0%{?suse_version} < 1120 -Requires: lha -%endif -%if 0%{?suse_version} > 1140 -BuildRequires: systemd -%{?systemd_requires} -%endif Recommends: unar Recommends: clamav perl-spamassassin Recommends: perl-DBI @@ -95,10 +82,14 @@ Recommends: p7zip Recommends: binutils Recommends: %{name}-docs = %{version} -%if 0%{?suse_version} > 1310 Requires(pre): util-linux-systemd Requires(post): util-linux-systemd -%endif +Requires(pre): pwdutils +Requires(post): %fillup_prereq +Requires(post): grep +OrderWithRequires(post): /usr/bin/newaliases +BuildRequires: systemd-rpm-macros +%{?systemd_ordering} Provides: amavisd-milter = 1.6.0 Obsoletes: amavisd-milter <= 1.5.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -149,7 +140,6 @@ %build cd amavisd-milter* -export CFLAGS="%{optflags}" %configure --localstatedir="%{avspool}" make %{?_smp_mflags} @@ -173,49 +163,31 @@ install -m 644 amavisd.conf %{buildroot}/etc/amavisd.conf install -m 644 LDAP.schema %{buildroot}/etc/openldap/schema/amavisd-new.schema install -m 644 JpegTester.pm %{buildroot}/%{perl_vendorlib}/JpegTester.pm -%if 0%{?suse_version} > 1140 mkdir -p %{buildroot}%{_unitdir} install -m 644 %{S:5} %{buildroot}%{_unitdir} -%endif -%if 0%{?suse_version} < 1230 -mkdir -p %{buildroot}/etc/init.d -install -m 755 %{S:2} %{buildroot}/etc/init.d/amavis -ln -s ../../etc/init.d/amavis %{buildroot}/%{_sbindir}/rcamavis -%else ln -s service %{buildroot}/%{_sbindir}/rcamavis -%endif install -m 755 %{S:6} %{buildroot}%{_sbindir}/ cd amavisd-milter* -make install DESTDIR="%{buildroot}" +%make_install %pre -%{_sbindir}/groupadd -r %{avgroup} 2> /dev/null || : +getent group %{avgroup} >/dev/null || \ + %{_sbindir}/groupadd -r %{avgroup} %{logmsg} "Added group %{avgroup} for package %{name}" -%{_sbindir}/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" -d %{avspool} %{avuser} 2> /dev/null || : +getent passwd %{avuser} >/dev/null || \ + %{_sbindir}/useradd -r -o -g %{avgroup} -u 65 -s /bin/false \ + -c "Vscan account" -d %{avspool} %{avuser} %{_sbindir}/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 exit 0 %post -%if 0%{?suse_version} < 1230 -%{fillup_and_insserv -n amavis amavis} -%else %{fillup_only -n amavis} -%endif -%if 0%{?suse_version} > 1140 %service_add_post amavis.service -%endif # Update ? if [ ${1:-0} -gt 1 ]; then : OK currently nothing to do @@ -234,13 +206,7 @@ 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) @@ -257,10 +223,8 @@ %{_fillupdir}/sysconfig.amavis %{_sbindir}/* %{perl_vendorlib}/JpegTester.pm -%if 0%{?suse_version} > 1140 %{_unitdir}/amavis.service %{_sbindir}/amavisd-milter.sh -%endif %defattr(0750,%{avuser},%{avgroup}, 0750) %dir %{avspool} %dir %{avspool}/tmp
