From 7d600196ed93d3a29d8755481a315d746ce47ca83d8cd46b1d205250c623e87e Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Fri, 18 Sep 2020 11:47:20 +0000
Subject: [PATCH] Accepting request 835368 from
 home:mrostecki:branches:network:utilities

- Remove firewalld service file - it's in the main firewalld
  package now.

OBS-URL: https://build.opensuse.org/request/show/835368
OBS-URL: https://build.opensuse.org/package/show/network:utilities/nbd?expand=0&rev=72
---
 nbd.changes   |  6 ++++++
 nbd.firewalld |  6 ------
 nbd.spec      | 18 ------------------
 3 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 nbd.firewalld

diff --git a/nbd.changes b/nbd.changes
index 02fa3d0..b0e291b 100644
--- a/nbd.changes
+++ b/nbd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 18 08:53:47 UTC 2020 - Michał Rostecki <mrostecki@suse.com>
+
+- Remove firewalld service file - it's in the main firewalld
+  package now.
+
 -------------------------------------------------------------------
 Thu Aug 20 07:03:13 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/nbd.firewalld b/nbd.firewalld
deleted file mode 100644
index a85bcdd..0000000
--- a/nbd.firewalld
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>NBD</short>
-  <description>The Network Block Device is a Linux-originated lightweight block access protocol that allows one to export a block device to a client.</description>
-  <port protocol="tcp" port="10809"/>
-</service>
diff --git a/nbd.spec b/nbd.spec
index 837a407..b89c223 100644
--- a/nbd.spec
+++ b/nbd.spec
@@ -19,11 +19,6 @@
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-%if 0%{?suse_version} >= 1500
-%define use_firewalld 1
-%else
-%define use_firewalld 0
-%endif
 Name:           nbd
 Version:        3.20
 Release:        0
@@ -36,9 +31,6 @@ Source1:        %{name}-server.service
 Source3:        config.example
 Source4:        nbd-server.sysconfig
 Source5:        nbd-client.service
-#%%if %%{use_firewalld}
-Source10:       nbd.firewalld
-#%%endif
 Patch1:         0001_fix_setgroup.patch
 BuildRequires:  pkgconfig
 BuildRequires:  systemd-rpm-macros
@@ -96,11 +88,6 @@ touch %{buildroot}%{_sysconfdir}/nbd-server/allow
 install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/nbd-server/config.example
 install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%{name}-server
 
-# install firewall information file
-%if %{use_firewalld}
-install -D -m 644 %{SOURCE10} %{buildroot}%{_prefix}/lib/firewalld/services/%{name}.xml
-%endif
-
 %post
 export DISABLE_RESTART_ON_UPDATE=yes
 %service_add_post %{name}-server.service
@@ -158,10 +145,5 @@ fi
 %dir %{_prefix}/lib/modules-load.d/
 %{_prefix}/lib/modules-load.d/nbd.conf
 %{_fillupdir}/sysconfig.%{name}-server
-%if %{use_firewalld}
-%dir %{_prefix}/lib/firewalld
-%dir %{_prefix}/lib/firewalld/services
-%{_prefix}/lib/firewalld/services/%{name}.xml
-%endif
 
 %changelog