Hello community, here is the log from the commit of package bind for openSUSE:Factory checked in at 2017-02-25 00:48:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bind (Old) and /work/SRC/openSUSE:Factory/.bind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bind" Changes: -------- --- /work/SRC/openSUSE:Factory/bind/bind.changes 2017-02-18 03:15:02.158783248 +0100 +++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2017-02-25 00:48:57.494647786 +0100 @@ -1,0 +2,5 @@ +Sat Feb 18 17:24:58 UTC 2017 - kukuk@suse.com + +- Don't require and call insserv if we use systemd + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bind.spec ++++++ --- /var/tmp/diff_new_pack.yTaneV/_old 2017-02-25 00:48:59.150395408 +0100 +++ /var/tmp/diff_new_pack.yTaneV/_new 2017-02-25 00:48:59.154394798 +0100 @@ -57,6 +57,8 @@ BuildRequires: python-base %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 BuildRequires: systemd-rpm-macros +%else +PreReq: %insserv_prereq %endif BuildRequires: update-desktop-files Provides: bind8 @@ -66,7 +68,7 @@ Obsoletes: bind9 < %version Requires: %{name}-chrootenv Requires: %{name}-utils -PreReq: %fillup_prereq %insserv_prereq bind-utils /bin/grep /bin/sed /bin/mkdir /usr/bin/tee /bin/chmod /bin/chown /bin/mv /bin/cat /usr/bin/dirname /usr/bin/diff /usr/bin/old +PreReq: %fillup_prereq bind-utils /bin/grep /bin/sed /bin/mkdir /usr/bin/tee /bin/chmod /bin/chown /bin/mv /bin/cat /usr/bin/dirname /usr/bin/diff /usr/bin/old Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd /usr/sbin/usermod Url: http://isc.org/sw/bind/ @@ -598,13 +600,16 @@ %endif %preun -%stop_on_removal named %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_del_preun named.service +%else +%stop_on_removal named %endif %post +%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1230 %{fillup_and_insserv -nf named} +%endif %{fillup_only -nsa named named} if [ ! -f etc/rndc.key ]; then usr/sbin/rndc-confgen -a -b 512 -r dev/urandom @@ -714,20 +719,22 @@ fi # End of 'Are we in update mode?' # Remove TEMP_SYSCONFIG_FILE in any case. rm -f ${TEMP_SYSCONFIG_FILE} +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 +%service_add_post named.service +%else NAMED_ACTIVE_FILE="var/adm/named.was.active" if [ -f ${NAMED_ACTIVE_FILE} ]; then sbin/insserv named test ! -s ${NAMED_ACTIVE_FILE} && rm -f ${NAMED_ACTIVE_FILE} fi -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 -%service_add_post named.service %endif %postun -%restart_on_update named -%insserv_cleanup %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_del_postun named.service +%else +%restart_on_update named +%insserv_cleanup %endif %post -n libbind9-140 -p /sbin/ldconfig @@ -777,24 +784,28 @@ if [ ! -s etc/lwresd.conf ]; then rm -f etc/lwresd.conf fi -if [ $1 -le 1 ]; then - %{fillup_and_insserv -fy lwresd} -fi; %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_add_post lwresd.service +%else +if [ $1 -le 1 ]; then + %{fillup_and_insserv -fy lwresd} +fi %endif %preun lwresd %stop_on_removal lwresd %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_del_preun lwresd.service +%else +%stop_on_removal lwresd %endif %postun lwresd -%restart_on_update lwresd -%insserv_cleanup %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_del_postun lwresd.service +%else +%restart_on_update lwresd +%insserv_cleanup %endif %post utils
participants (1)
-
root@hilbertn.suse.de