Accepting request 714800 from home:mgerstner:branches:network

- removal of SuSEfirewall2 service from Factory, since SuSEfirewall2 has been
  replaced by firewalld, see [1].
  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html

OBS-URL: https://build.opensuse.org/request/show/714800
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=257

bind.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 12 08:43:29 UTC 2019 - matthias.gerstner@suse.com
+
+- removal of SuSEfirewall2 service from Factory, since SuSEfirewall2 has been
+  replaced by firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
 -------------------------------------------------------------------
 Tue Apr 16 10:15:22 UTC 2019 - Navin Kukreja <navin.kukreja@suse.com>
 

bind.spec

@@ -48,6 +48,11 @@
 %else
 %define with_systemd 0
 %endif
+%if 0%{?suse_version} < 1315
+%define with_sfw2 1
+%else
+%define with_sfw2 0
+%endif
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
@@ -390,9 +395,11 @@ mkdir -p \
 	%{buildroot}%{_mandir}/{man1,man3,man5,man8} \
 	%{buildroot}%{_fillupdir} \
 	%{buildroot}/%{_rundir} \
-	%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \
 	%{buildroot}%{_includedir}/bind/dns \
 	%{buildroot}%{_libexecdir}/bind
+%if %{with_sfw2}
+mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
+%endif
 %make_install
 # install errno2result.h, some dynamic DB plugins could use it.
 install -m 0755 -d %{buildroot}%{_includedir}/isc/
@@ -442,7 +449,9 @@ ln -s ..%{_localstatedir}/lib/named%{_localstatedir}/run/named %{buildroot}/run
 for file in named-common named-named syslog-named; do
 	install -m 0644 vendor-files/sysconfig/${file} %{buildroot}%{_fillupdir}/sysconfig.${file}
 done
+%if %{with_sfw2}
 install -m 644 vendor-files/sysconfig/SuSEFirewall.named %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/bind
+%endif
 # Cleanup doc
 rm doc/misc/Makefile*
 find doc/arm -type f ! -name '*.html' -print0 | xargs -0 rm -f
@@ -576,7 +585,9 @@ fi
 %else
 %config /%{_sysconfdir}/init.d/named
 %endif
+%if %{with_sfw2}
 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/bind
+%endif
 %{_bindir}/bind9-config
 %{_bindir}/named-rrchecker
 %{_sbindir}/rcnamed