Accepting request 718914 from X11:RemoteDesktop

- Removal of SuSEfirewall2 service, since SuSEfirewall2 has been
  replaced by firewalld, see:
  https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html

OBS-URL: https://build.opensuse.org/request/show/718914
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xrdp?expand=0&rev=24

xrdp.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 26 12:31:01 UTC 2019 - matthias.gerstner@suse.com
+
+- Removal of SuSEfirewall2 service, since SuSEfirewall2 has been
+  replaced by firewalld, see:
+
+  https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
 -------------------------------------------------------------------
 Mon Apr 29 17:25:19 UTC 2019 - Felix Zhang <fezhang@suse.com>
 

xrdp.fw

@@ -1,6 +0,0 @@
-## Name: Remote Desktop Protocol
-## Description: Opens ports for Remote Desktop Protocol
-
-# space separated list of allowed TCP ports
-TCP="3389"
-

xrdp.spec

@@ -21,7 +21,6 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 Name:           xrdp
 Version:        0.9.10
 Release:        0
@@ -32,7 +31,6 @@ Url:            https://github.com/neutrinolabs/xrdp
 Source0:        https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        xrdp.keyring
-Source3:        xrdp.fw
 Source4:        sysconfig.xrdp
 Source5:        force_stop
 Source100:      %{name}-rpmlintrc
@@ -124,8 +122,6 @@ make %{?_smp_mflags}
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
 find %{buildroot} -name '*.a' -delete
 find %{buildroot} -type f -name "*.la" -delete -print
-mkdir -p %{buildroot}/%{_fwdefdir}
-install -m 644 %{SOURCE3} %{buildroot}/%{_fwdefdir}/xrdp
 mkdir -p %{buildroot}/%{_fillupdir}
 install -m 644 %{SOURCE4} %{buildroot}/%{_fillupdir}/sysconfig.xrdp
 mkdir -p %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp
@@ -183,7 +179,6 @@ exit 0
 %dir %{_libdir}/xrdp
 %dir %{_sysconfdir}/xrdp
 %dir %{_sysconfdir}/xrdp/pulse
-%config %{_fwdefdir}/xrdp
 %config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
 %config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
 %config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini