From 23905fc33e2dd406b6c3f4c2351b5f3622ad0bf159e2a297e427755d60a8a9be Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 7 Feb 2022 21:12:13 +0000 Subject: [PATCH] Accepting request 951614 from home:dimstar:Factory - Rework files section: do not add config(noreplace) marker on the directory /etc/xrdp, but only on the content of the directory. + the config(noreplace) marker on the dircreates a rpm metadata marker, which can be identified as conflicting with other packages also owning /etc/xrdp, without the marker + The re-org of the files section happens to also fix warnings about files listed twice. The old buildlog contained entries like ``` [ 124s] warning: File listed twice: /etc/xrdp [ 124s] warning: File listed twice: /etc/xrdp/km-00000406.ini [ 124s] warning: File listed twice: /etc/xrdp/km-00000407.ini [ 124s] warning: File listed twice: /etc/xrdp/km-00000409.ini [ 124s] warning: File listed twice: /etc/xrdp/km-0000040a.ini [ 124s] warning: File listed twice: /etc/xrdp/km-0000040b.ini [ 124s] warning: File listed twice: /etc/xrdp/km-0000040c.ini [ 124s] warning: File listed twice: /etc/xrdp/km-00000410.ini [ 124s] warning: File listed twice: /etc/xrdp/km-00000411.ini ``` OBS-URL: https://build.opensuse.org/request/show/951614 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=95 --- xrdp.changes | 11 +++++++++++ xrdp.spec | 22 ++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/xrdp.changes b/xrdp.changes index 719af5a..5f4d875 100644 --- a/xrdp.changes +++ b/xrdp.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Feb 4 17:05:51 UTC 2022 - Dominique Leuenberger + +- Rework files section: do not add config(noreplace) marker on the + directory /etc/xrdp, but only on the content of the directory. + + the config(noreplace) marker on the dircreates a rpm metadata + marker, which can be identified as conflicting with other + packages also owning /etc/xrdp, without the marker + + The re-org of the files section happens to also fix warnings + about files listed twice. + ------------------------------------------------------------------- Wed Aug 11 13:46:09 UTC 2021 - Daike Yu diff --git a/xrdp.spec b/xrdp.spec index 7e9f002..877da58 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -1,7 +1,7 @@ # # spec file for package xrdp # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -179,11 +179,7 @@ exit 0 %dir %{_datadir}/xrdp %dir %{_libdir}/xrdp -%dir %{_sysconfdir}/xrdp -%dir %{_sysconfdir}/xrdp/pulse %config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman -%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini -%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini %license COPYING %doc *.txt %{_bindir}/xrdp* @@ -195,15 +191,21 @@ exit 0 %{_libexecdir}/initscripts/legacy-actions/xrdp %{_sbindir}/rc* %{_sbindir}/xrdp* -%{_sysconfdir}/xrdp/km*.ini -%{_sysconfdir}/xrdp/pulse/default.pa -%{_sysconfdir}/xrdp/xrdp_keyboard.ini +%dir %{_sysconfdir}/xrdp +%config(noreplace) %{_sysconfdir}/xrdp/km*.ini +%dir %{_sysconfdir}/xrdp/pulse +%config(noreplace) %{_sysconfdir}/xrdp/pulse/default.pa +%config(noreplace) %{_sysconfdir}/xrdp/reconnectwm.sh +%ghost %config(noreplace) %{_sysconfdir}/xrdp/rsakeys.ini +%config(noreplace) %{_sysconfdir}/xrdp/startwm.sh +%config(noreplace) %{_sysconfdir}/xrdp/xrdp_keyboard.ini +%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini +%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini + %{_unitdir}/xrdp* %ghost %{_localstatedir}/log/xrdp-sesman.log -%config(noreplace) %{_sysconfdir}/xrdp/ -%ghost %config(noreplace) %{_sysconfdir}/xrdp/rsakeys.ini %config %{_fillupdir}/sysconfig.xrdp %files devel