Accepting request 459475 from network

1

OBS-URL: https://build.opensuse.org/request/show/459475
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bind?expand=0&rev=121

bind.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Feb 18 17:24:58 UTC 2017 - kukuk@suse.com
+
+- Don't require and call insserv if we use systemd
+
 -------------------------------------------------------------------
 Wed Feb 15 12:50:42 UTC 2017 - navin.kukreja@suse.com
 

bind.spec

@@ -57,6 +57,8 @@ BuildRequires:  openssl-devel
 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:      bind8 < %version
 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 @@ echo "NAMED_RUN_CHROOTED=\"${NAMED_RUN_CHROOTED}\"" >${TEMP_SYSCONFIG_FILE}
 %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 'Add include files to NAMED_CONF_INCLUDE_FILES'
 fi # End of 'Are we in update mode?'
 # Remove TEMP_SYSCONFIG_FILE in any case.
 rm -f ${TEMP_SYSCONFIG_FILE}
-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
+%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
 %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 @@ fi
 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