From 65881b716f0ce220dd8a324dd7e70a9ed7722da1ec7a621e3458648437b9b8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 5 Jul 2019 17:23:01 +0000
Subject: [PATCH] Accepting request 713605 from home:mgerstner:branches:network

- removal of SuSEfirewall2 service, 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/713605
OBS-URL: https://build.opensuse.org/package/show/network/atftp?expand=0&rev=40
---
 atftp.changes | 8 ++++++++
 atftp.fw      | 5 -----
 atftp.spec    | 7 +------
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 atftp.fw

diff --git a/atftp.changes b/atftp.changes
index 9205614..c121fa0 100644
--- a/atftp.changes
+++ b/atftp.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul  5 11:45:37 UTC 2019 - matthias.gerstner@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+  firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
 -------------------------------------------------------------------
 Fri Apr 26 09:37:19 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 
diff --git a/atftp.fw b/atftp.fw
deleted file mode 100644
index 5c09d36..0000000
--- a/atftp.fw
+++ /dev/null
@@ -1,5 +0,0 @@
-## Name: aTFTP Server
-## Description: Opens ports for tftp service.
-
-# space separated list of allowed UDP ports
-UDP="tftp"
diff --git a/atftp.spec b/atftp.spec
index 8716fc1..933672b 100644
--- a/atftp.spec
+++ b/atftp.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -22,7 +22,6 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 Name:           atftp
 Version:        0.7.2
 Release:        0
@@ -33,7 +32,6 @@ URL:            https://sourceforge.net/projects/atftp/
 Source:         %{name}-%{version}.tar.gz
 Source2:        atftpd.sysconfig
 Source3:        atftpd.logrotate
-Source4:        atftp.fw
 Source5:        atftpd.service
 Source6:        atftpd.socket
 # PATCH-FIX-SUSE sorcerer's apprentice syndrom (bnc#727843)
@@ -93,8 +91,6 @@ install -D -m 0644 %{SOURCE6} %{buildroot}/%{_unitdir}/atftpd.socket
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcatftpd
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.atftpd
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-mkdir -p %{buildroot}/%{_fwdefdir}
-install -m 0644 %{SOURCE4} %{buildroot}/%{_fwdefdir}/atftp
 install -d -m 0755 %{buildroot}/srv/tftpboot
 install -d -m 0750 %{buildroot}%{_localstatedir}/log/atftpd
 
@@ -139,7 +135,6 @@ fi
 %{_mandir}/man8/atftpd.8.gz
 %{_mandir}/man8/in.tftpd.8.gz
 
-%config %{_fwdefdir}/atftp
 %dir %attr(0755,tftp,tftp) /srv/tftpboot
 %dir %attr(0750,tftp,tftp) %{_localstatedir}/log/atftpd/