Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xrdp for openSUSE:Factory checked in
at 2022-02-07 23:38:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xrdp (Old)
and /work/SRC/openSUSE:Factory/.xrdp.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdp"
Mon Feb 7 23:38:31 2022 rev:42 rq:952256 version:0.9.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/xrdp/xrdp.changes 2021-09-14
21:15:06.384447242 +0200
+++ /work/SRC/openSUSE:Factory/.xrdp.new.1898/xrdp.changes 2022-02-07
23:40:05.797620807 +0100
@@ -1,0 +2,11 @@
+Fri Feb 4 17:05:51 UTC 2022 - Dominique Leuenberger <dims...@opensuse.org>
+
+- 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.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrdp.spec ++++++
--- /var/tmp/diff_new_pack.ffOm35/_old 2022-02-07 23:40:06.353617001 +0100
+++ /var/tmp/diff_new_pack.ffOm35/_new 2022-02-07 23:40:06.357616974 +0100
@@ -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 @@
%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 @@
%{_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
