Accepting request 854648 from home:lee_duncan:branches:Base:System

- Removed isns.xml, as firewalld already supplies this file.
  Note that SuSEFirewall2 is also no longer supported, which
  obviates the need for the file "open-isns-firewall.service",
  which was used in SLES but not in openSUSE.

OBS-URL: https://build.opensuse.org/request/show/854648
OBS-URL: https://build.opensuse.org/package/show/Base:System/open-isns?expand=0&rev=35

isns.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>iSNS</short>
-  <description>The Internet Storage Name Service makes it easier to discover, manage, and configure iSCSI devices. Enable this service if you run the isnsd daemon (server).</description>
-  <port protocol="tcp" port="3205"/>
-  <port protocol="udp" port="3205"/>
-</service>

open-isns.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Dec 10 18:10:11 UTC 2020 - Lee Duncan <lduncan@suse.com>
+
+- Removed isns.xml, as firewalld already supplies this file.
+  Note that SuSEFirewall2 is also no longer supported, which
+  obviates the need for the file "open-isns-firewall.service",
+  which was used in SLES but not in openSUSE.
+
 -------------------------------------------------------------------
 Mon Dec  7 23:49:05 UTC 2020 - Lee Duncan <lduncan@suse.com>
 

open-isns.spec

@@ -25,11 +25,9 @@ Release:        0
 Source:         %{name}-%{version}.tar.xz
 Patch1:         %{name}-updates.diff.bz2
 URL:            https://github.com/open-iscsi/%{name}
-Source1:        isns.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  firewall-macros
 BuildRequires:  glibc-devel
 BuildRequires:  make
 BuildRequires:  openssl-devel
@@ -75,7 +73,6 @@ if [ ! -d "%{buildroot}/usr/sbin" ] ; then
 fi
 ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcisnsd
 make DESTDIR="%{buildroot}" install_hdrs install_lib
-install -D -m 644 %{S:1} %{buildroot}%{_prefix}/lib/firewalld/services/isns.xml
 install -m 755 isnssetup %{buildroot}%{_sbindir}
 
 %post
@@ -83,7 +80,6 @@ install -m 755 isnssetup %{buildroot}%{_sbindir}
 
 %postun
 %{service_del_postun isnsd.socket isnsd.service}
-%firewalld_reload
 
 %pre
 %{service_add_pre isnsd.socket isnsd.service}
@@ -101,9 +97,6 @@ install -m 755 isnssetup %{buildroot}%{_sbindir}
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsd.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsadm.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsdd.conf
-%dir %{_prefix}/lib/firewalld
-%dir %{_prefix}/lib/firewalld/services
-%{_prefix}/lib/firewalld/services/isns.xml
 %{_sbindir}/rcisnsd
 %license COPYING
 %doc HACKING README TODO