From a18eb083dca8ae171d7ec66699b398c5620655187bc980d5ed8ca171f98516f7 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 1 Jul 2022 08:44:22 +0000
Subject: [PATCH] Accepting request 986067 from home:schubi2

- Moved logrotate files from user specific directory /etc/logrotate.d
  to vendor specific directory /usr/etc/logrotate.d.

OBS-URL: https://build.opensuse.org/request/show/986067
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=247
---
 xdm.changes | 6 ++++++
 xdm.spec    | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/xdm.changes b/xdm.changes
index 2f4d8c3..dd4f652 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 30 12:18:41 UTC 2022 - Stefan Schubert <schubi@suse.de>
+
+- Moved logrotate files from user specific directory /etc/logrotate.d
+  to vendor specific directory /usr/etc/logrotate.d.
+
 -------------------------------------------------------------------
 Mon Apr  4 10:13:13 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xdm.spec b/xdm.spec
index 33e10c9..cc0f734 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -176,6 +176,11 @@ ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_prefix}/
 # Inject a dummy 'console' selection - which used to be choice in /etc/sysconfig/displaymanager
 touch %{buildroot}%{_prefix}/lib/X11/displaymanagers/console
 
+%if 0%{?UsrEtcMove}
+mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
+mv %{buildroot}%{_sysconfdir}/logrotate.d/xdm %{buildroot}%{_distconfdir}/logrotate.d/xdm
+%endif
+
 %post
 # enable Xorg on s390x with virtio (Redhat PCI ID 1af4:1050) on installation (but not upgrade)
 if [ $1 -eq 1 ] ; then
@@ -239,7 +244,11 @@ sed -i 's/DISPLAYMANAGER=.*//g' %{_sysconfdir}/sysconfig/displaymanager
 %{_prefix}/lib/firewalld/services/x11.xml
 %{_unitdir}/display-manager.service
 %{_prefix}/lib/X11/display-manager
+%if 0%{?UsrEtcMove}
+%{_distconfdir}/logrotate.d/xdm
+%else
 %config %{_sysconfdir}/logrotate.d/xdm
+%endif
 %if 0%{?UsrEtcMove}
 %{_distconfdir}/pam.d/xdm
 %{_distconfdir}/pam.d/xdm-np