From 5a284e29872988e927537adc0abe8801006571d147b819de35ff61e09a341869 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 5 Sep 2020 02:52:20 +0000
Subject: [PATCH] - moved xinit files to /usr/etc/X11/xinit and removed xinitrc
   skeleton (boo#1173052)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=50
---
 xinit-tarball.patch | 95 +++++++++++++++++++++++++++++++++++++++++++++
 xinit.changes       |  6 +++
 xinit.spec          | 21 +++++++++-
 3 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 xinit-tarball.patch

diff --git a/xinit-tarball.patch b/xinit-tarball.patch
new file mode 100644
index 0000000..e553d42
--- /dev/null
+++ b/xinit-tarball.patch
@@ -0,0 +1,95 @@
+diff -u -r ../old/etc/X11/xinit/xinitrc ./etc/X11/xinit/xinitrc
+--- ../old/etc/X11/xinit/xinitrc	2020-08-23 17:36:47.813664000 +0200
++++ ./etc/X11/xinit/xinitrc	2020-09-05 04:00:24.861796000 +0200
+@@ -27,7 +27,7 @@
+ # Source common code shared between the
+ # X session and X init scripts
+ #
+-. /etc/X11/xinit/xinitrc.common
++. /usr/etc/X11/xinit/xinitrc.common
+ 
+ #
+ # Special for twm
+diff -u -r ../old/etc/X11/xinit/xinitrc.common ./etc/X11/xinit/xinitrc.common
+--- ../old/etc/X11/xinit/xinitrc.common	2020-03-24 12:39:54.076007000 +0100
++++ ./etc/X11/xinit/xinitrc.common	2020-09-05 04:29:58.345399000 +0200
+@@ -1,4 +1,4 @@
+-# /etc/X11/xinit/xinitrc.common
++# /usr/etc/X11/xinit/xinitrc.common
+ #
+ # Common code used in X session and X init scripts.
+ # File shall be sourced but not executed by the scripts.
+@@ -15,6 +15,7 @@
+ # Some common user and system files,
+ #
+     XETCDIR=/etc/X11
++ XUSRETCDIR=/usr/etc/X11
+   xdefaults=$HOME/.Xdefaults
+  xresources=$HOME/.Xresources
+     xmodmap=$HOME/.Xmodmap
+@@ -37,7 +38,7 @@
+ #
+ # Run user xinit scripts.
+ #
+-for script in /etc/X11/xinit/xinitrc.d/*; do
++for script in /usr/etc/X11/xinit/xinitrc.d/*; do
+     test -e $script || continue
+     test -d $script && continue
+     case "$script" in
+@@ -140,7 +141,11 @@
+ #
+ # Start the XIM server
+ #
+-XIMFILE=/etc/X11/xim
++if [ -r /usr/etc/X11/xim ]; then
++    XIMFILE=/usr/etc/X11/xim
++else
++    XIMFILE=/etc/X11/xim
++fi
+ test -r $HOME/.xim && XIMFILE=$HOME/.xim
+ test -r $XIMFILE   && source $XIMFILE
+ 
+@@ -167,12 +172,16 @@
+     # apply system's xkb first
+     if test -s $XETCDIR/Xkbmap; then
+         test -r $XETCDIR/Xkbmap && cat $XETCDIR/Xkbmap | xkbcomp - $DISPLAY
++    elif test -s $XUSRETCDIR/Xkbmap; then
++        test -r $XUSRETCDIR/Xkbmap && cat $XUSRETCDIR/Xkbmap | xkbcomp - $DISPLAY
+     fi
+     test -r "$xkbmap"  && cat "$xkbmap" | xkbcomp - $DISPLAY
+ elif test -s "$xmodmap"; then
+     test -r "$xmodmap" && xmodmap "$xmodmap"
+ elif test -s $XETCDIR/Xkbmap ; then
+     test -r $XETCDIR/Xkbmap && cat $XETCDIR/Xkbmap | xkbcomp - $DISPLAY
++elif test -s $XUSRETCDIR/Xkbmap ; then
++    test -r $XUSRETCDIR/Xkbmap && cat $XUSRETCDIR/Xkbmap | xkbcomp - $DISPLAY
+ fi
+ 
+ #
+@@ -182,6 +191,9 @@
+     if test -r $XETCDIR/Xresources ; then
+ 	xrdb -nocpp -load   -retain $XETCDIR/Xresources
+ 	xrdb -I$HOME -merge "$xdefaults"
++    elif test -r $XUSRETCDIR/Xresources ; then
++        xrdb -nocpp -load   -retain $XUSRETCDIR/Xresources
++        xrdb -I$HOME -merge "$xdefaults"
+     else
+ 	xrdb -I$HOME -load -retain "$xdefaults"
+     fi
+@@ -192,11 +204,16 @@
+     if test -r $XETCDIR/Xresources ; then
+ 	xrdb -nocpp -load  -retain $XETCDIR/Xresources
+ 	xrdb -I$HOME -merge "$xresources"
++    elif test -r $XUSRETCDIR/Xresources ; then
++        xrdb -nocpp -load  -retain $XUSRETCDIR/Xresources
++        xrdb -I$HOME -merge "$xresources"
+     else
+ 	xrdb -I$HOME -load -retain "$xresources"
+     fi
+ elif test -r $XETCDIR/Xresources ; then
+     xrdb -nocpp -load -retain $XETCDIR/Xresources
++elif test -r $XUSRETCDIR/Xresources ; then
++    xrdb -nocpp -load -retain $XUSRETCDIR/Xresources
+ fi
+ 
+ # prevent gnome-session from failing (boo#1163262)
diff --git a/xinit.changes b/xinit.changes
index 7014a88..f0da4a9 100644
--- a/xinit.changes
+++ b/xinit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep  5 02:48:39 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- moved xinit files to /usr/etc/X11/xinit and removed xinitrc
+  skeleton (boo#1173052) 
+
 -------------------------------------------------------------------
 Sun Aug 23 15:38:01 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xinit.spec b/xinit.spec
index e4623bb..5e2cd71 100644
--- a/xinit.spec
+++ b/xinit.spec
@@ -32,6 +32,7 @@ Patch1:         xinit-client-session.patch
 Patch2:         xinit-suse.patch
 Patch3:         xinit-tolerant-hostname-changes.patch
 Patch4:         xinit-nolonger-unset-dbus-session.patch
+Patch5:         xinit-tarball.patch
 # needed for patch0
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -62,6 +63,9 @@ terminate.
 
 %prep
 %setup -q
+%if 0%{?suse_version} >= 1550
+sed -i 's+/etc+/usr/etc+' %{PATCH0}
+%endif
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
@@ -81,15 +85,28 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1
 install -m 0711 keygen %{buildroot}%{_bindir}/keygen
 pushd %{buildroot}
 tar xf %{SOURCE1}
+%if 0%{?suse_version} >= 1550
+patch -p0 < %{PATCH5}
+mkdir -p usr/etc/X11/xinit
+mv etc/X11/Xresources usr/etc/X11
+mv etc/X11/xinit/*    usr/etc/X11/xinit
+rmdir etc/X11/xinit
+rmdir etc/X11
+rmdir etc
+%endif
 popd
-install -D %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc %{buildroot}%{_sysconfdir}/skel/.xinitrc.template
 
 %files
 %defattr(-,root,root)
 %doc ChangeLog COPYING README.md
+%if 0%{?suse_version} >= 1550
+%dir %{_distconfdir}/X11
+%{_distconfdir}/X11/xinit/
+%{_distconfdir}/X11/Xresources
+%else
 %config %{_sysconfdir}/X11/xinit/
 %config %{_sysconfdir}/X11/Xresources
-%config %{_sysconfdir}/skel/.xinitrc.template
+%endif
 %{_bindir}/keygen
 %{_bindir}/startx
 %{_bindir}/xinit