From 6e3d595f5f642b9893003b1875bb66098560290dab8621a36fdf0083c95f185c Mon Sep 17 00:00:00 2001 From: Felix Zhang Date: Fri, 26 Jul 2019 15:19:51 +0000 Subject: [PATCH 1/2] Accepting request 718880 from home:mgerstner:branches:X11:RemoteDesktop - 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/718880 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=57 --- xrdp.changes | 8 ++++++++ xrdp.fw | 6 ------ xrdp.spec | 5 ----- 3 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 xrdp.fw diff --git a/xrdp.changes b/xrdp.changes index d6c3637..4ef0e8b 100644 --- a/xrdp.changes +++ b/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 [1]. + + [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html + ------------------------------------------------------------------- Mon Apr 29 17:25:19 UTC 2019 - Felix Zhang diff --git a/xrdp.fw b/xrdp.fw deleted file mode 100644 index 28a5ca9..0000000 --- a/xrdp.fw +++ /dev/null @@ -1,6 +0,0 @@ -## Name: Remote Desktop Protocol -## Description: Opens ports for Remote Desktop Protocol - -# space separated list of allowed TCP ports -TCP="3389" - diff --git a/xrdp.spec b/xrdp.spec index 2e72513..fecd7da 100644 --- a/xrdp.spec +++ b/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 From 70c5243d9d10d5634500f350501ec3969f0ea170ae62daf05db21d28866af5b9 Mon Sep 17 00:00:00 2001 From: Felix Zhang Date: Fri, 26 Jul 2019 15:27:20 +0000 Subject: [PATCH 2/2] Break long lines in changelog OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=58 --- xrdp.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xrdp.changes b/xrdp.changes index 4ef0e8b..197217a 100644 --- a/xrdp.changes +++ b/xrdp.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- Fri Jul 26 12:31:01 UTC 2019 - matthias.gerstner@suse.com -- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by - firewalld, see [1]. +- Removal of SuSEfirewall2 service, since SuSEfirewall2 has been + replaced by firewalld, see: - [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html + https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html ------------------------------------------------------------------- Mon Apr 29 17:25:19 UTC 2019 - Felix Zhang