From 5a284e29872988e927537adc0abe8801006571d147b819de35ff61e09a341869 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 5 Sep 2020 02:52:20 +0000 Subject: [PATCH 1/9] - 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 + +- moved xinit files to /usr/etc/X11/xinit and removed xinitrc + skeleton (boo#1173052) + ------------------------------------------------------------------- Sun Aug 23 15:38:01 UTC 2020 - Stefan Dirsch 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 From 6c6a9c2a69a9c7f002cd28b3cdcbb1ea9255487b7db083bd99199a3bc2aff971 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 5 Sep 2020 02:53:53 +0000 Subject: [PATCH 2/9] patch5 comment OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=51 --- xinit.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xinit.spec b/xinit.spec index 5e2cd71..4eca61e 100644 --- a/xinit.spec +++ b/xinit.spec @@ -71,6 +71,8 @@ sed -i 's+/etc+/usr/etc+' %{PATCH0} %patch2 -p1 %patch3 -p1 %patch4 -p1 +### get rid of checkin warning; patch applied in %install section +#%patch5 -p0 # needed for patch0 autoreconf -fi From dfc068a2bb6c67359028a0ce3f14cdd82e48d688f3735dea44a7f3acb6794013 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 5 Sep 2020 02:55:31 +0000 Subject: [PATCH 3/9] improved comment for patch5 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=52 --- xinit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinit.spec b/xinit.spec index 4eca61e..dffc7c2 100644 --- a/xinit.spec +++ b/xinit.spec @@ -71,7 +71,7 @@ sed -i 's+/etc+/usr/etc+' %{PATCH0} %patch2 -p1 %patch3 -p1 %patch4 -p1 -### get rid of checkin warning; patch applied in %install section +### patch is applied later in %install section #%patch5 -p0 # needed for patch0 autoreconf -fi From b860384b90b1d6daf5e117175b4b954fc2229f24f657fc89d237cd62410f5bb6 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 5 Sep 2020 08:53:11 +0000 Subject: [PATCH 4/9] - xdm-tarball.patch * adjust tarball contenct to /usr/etc move (boo#1173052) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=53 --- xinit.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xinit.changes b/xinit.changes index f0da4a9..f1c2bae 100644 --- a/xinit.changes +++ b/xinit.changes @@ -3,6 +3,8 @@ Sat Sep 5 02:48:39 UTC 2020 - Stefan Dirsch - moved xinit files to /usr/etc/X11/xinit and removed xinitrc skeleton (boo#1173052) +- xdm-tarball.patch + * adjust tarball contenct to /usr/etc move (boo#1173052) ------------------------------------------------------------------- Sun Aug 23 15:38:01 UTC 2020 - Stefan Dirsch From 379530dc8183ce7c1229813aad3d943ea271624ca9b5580a3f25ab961977cde5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 5 Sep 2020 09:06:36 +0000 Subject: [PATCH 5/9] fixed typo in changelog OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=54 --- xinit.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinit.changes b/xinit.changes index f1c2bae..342f63a 100644 --- a/xinit.changes +++ b/xinit.changes @@ -3,7 +3,7 @@ Sat Sep 5 02:48:39 UTC 2020 - Stefan Dirsch - moved xinit files to /usr/etc/X11/xinit and removed xinitrc skeleton (boo#1173052) -- xdm-tarball.patch +- xinit-tarball.patch * adjust tarball contenct to /usr/etc move (boo#1173052) ------------------------------------------------------------------- From 7ac81f565f032f906f5e332ec37a45940d773c4786df07df5ff7f198add68dd9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Sep 2020 09:48:23 +0000 Subject: [PATCH 6/9] - reverted move to /usr/etc/X11/xinit for now (boo#1175123, comment#6) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=55 --- xinit.changes | 5 +++++ xinit.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xinit.changes b/xinit.changes index 342f63a..5df1d89 100644 --- a/xinit.changes +++ b/xinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 8 09:44:08 UTC 2020 - Stefan Dirsch + +- reverted move to /usr/etc/X11/xinit for now (boo#1175123, comment#6) + ------------------------------------------------------------------- Sat Sep 5 02:48:39 UTC 2020 - Stefan Dirsch diff --git a/xinit.spec b/xinit.spec index dffc7c2..24f4d57 100644 --- a/xinit.spec +++ b/xinit.spec @@ -16,6 +16,8 @@ # +%define UsrEtcMove 0 + Name: xinit Version: 1.4.1 Release: 0 @@ -63,7 +65,7 @@ terminate. %prep %setup -q -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} sed -i 's+/etc+/usr/etc+' %{PATCH0} %endif %patch0 -p0 @@ -87,7 +89,7 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1 install -m 0711 keygen %{buildroot}%{_bindir}/keygen pushd %{buildroot} tar xf %{SOURCE1} -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} patch -p0 < %{PATCH5} mkdir -p usr/etc/X11/xinit mv etc/X11/Xresources usr/etc/X11 @@ -101,7 +103,7 @@ popd %files %defattr(-,root,root) %doc ChangeLog COPYING README.md -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} %dir %{_distconfdir}/X11 %{_distconfdir}/X11/xinit/ %{_distconfdir}/X11/Xresources From 45db300befcd6b519514b5c457bacca4bbf27ad8e4e3557e658c13d676950655 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Sep 2020 11:43:12 +0000 Subject: [PATCH 7/9] - xinit-tarball.patch/xinit.spec * reenabled move to /usr/etc/X11/xinit * fixed remaining issues mentioned in boo#1173052, comment#6 and boo#1176212, comment#7 - fixed wrong bug number in changelog OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=56 --- xinit-tarball.patch | 38 +++++++++++++++++++++++++------------- xinit.changes | 10 +++++++++- xinit.spec | 21 ++++++++++++++------- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/xinit-tarball.patch b/xinit-tarball.patch index e553d42..f6eabbf 100644 --- a/xinit-tarball.patch +++ b/xinit-tarball.patch @@ -1,18 +1,22 @@ 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 @@ ++++ ./etc/X11/xinit/xinitrc 2020-09-08 12:57:08.577438000 +0200 +@@ -27,7 +27,11 @@ # Source common code shared between the # X session and X init scripts # -. /etc/X11/xinit/xinitrc.common -+. /usr/etc/X11/xinit/xinitrc.common ++if [ -r /etc/X11/xinit/xinitrc.common ]; then ++ . /etc/X11/xinit/xinitrc.common ++elif [ -r /usr/etc/X11/xinit/xinitrc.common ]; then ++ . /usr/etc/X11/xinit/xinitrc.common ++fi # # 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 ++++ ./etc/X11/xinit/xinitrc.common 2020-09-08 12:56:59.193451000 +0200 @@ -1,4 +1,4 @@ -# /etc/X11/xinit/xinitrc.common +# /usr/etc/X11/xinit/xinitrc.common @@ -27,29 +31,37 @@ diff -u -r ../old/etc/X11/xinit/xinitrc.common ./etc/X11/xinit/xinitrc.common xdefaults=$HOME/.Xdefaults xresources=$HOME/.Xresources xmodmap=$HOME/.Xmodmap -@@ -37,7 +38,7 @@ +@@ -37,9 +38,15 @@ # # Run user xinit scripts. # -for script in /etc/X11/xinit/xinitrc.d/*; do -+for script in /usr/etc/X11/xinit/xinitrc.d/*; do ++for script in /usr/etc/X11/xinit/xinitrc.d/* \ ++ /etc/X11/xinit/xinitrc.d/*; do test -e $script || continue test -d $script && continue ++ # higher priority for /etc/X11/xinit/xinitrc.d ... ++ if echo $script | grep -q ^/usr; then ++ sname=$(basename $script) ++ test -e /etc/X11/xinit/xinitrc.d/$sname && continue ++ fi case "$script" in -@@ -140,7 +141,11 @@ + .*) continue ;; + *.rpm*) continue ;; +@@ -140,7 +147,11 @@ # # Start the XIM server # -XIMFILE=/etc/X11/xim -+if [ -r /usr/etc/X11/xim ]; then -+ XIMFILE=/usr/etc/X11/xim -+else ++if [ -r /etc/X11/xim ]; then + XIMFILE=/etc/X11/xim ++elif [ -r /usr/etc/X11/xim ]; then ++ XIMFILE=/usr/etc/X11/xim +fi test -r $HOME/.xim && XIMFILE=$HOME/.xim test -r $XIMFILE && source $XIMFILE -@@ -167,12 +172,16 @@ +@@ -167,12 +178,16 @@ # apply system's xkb first if test -s $XETCDIR/Xkbmap; then test -r $XETCDIR/Xkbmap && cat $XETCDIR/Xkbmap | xkbcomp - $DISPLAY @@ -66,7 +78,7 @@ diff -u -r ../old/etc/X11/xinit/xinitrc.common ./etc/X11/xinit/xinitrc.common fi # -@@ -182,6 +191,9 @@ +@@ -182,6 +197,9 @@ if test -r $XETCDIR/Xresources ; then xrdb -nocpp -load -retain $XETCDIR/Xresources xrdb -I$HOME -merge "$xdefaults" @@ -76,7 +88,7 @@ diff -u -r ../old/etc/X11/xinit/xinitrc.common ./etc/X11/xinit/xinitrc.common else xrdb -I$HOME -load -retain "$xdefaults" fi -@@ -192,11 +204,16 @@ +@@ -192,11 +210,16 @@ if test -r $XETCDIR/Xresources ; then xrdb -nocpp -load -retain $XETCDIR/Xresources xrdb -I$HOME -merge "$xresources" diff --git a/xinit.changes b/xinit.changes index 5df1d89..250e7ca 100644 --- a/xinit.changes +++ b/xinit.changes @@ -1,7 +1,15 @@ +------------------------------------------------------------------- +Tue Sep 8 11:36:36 UTC 2020 - Stefan Dirsch + +- xinit-tarball.patch/xinit.spec + * reenabled move to /usr/etc/X11/xinit + * fixed remaining issues mentioned in boo#1173052, comment#6 + and boo#1176212, comment#7 + ------------------------------------------------------------------- Tue Sep 8 09:44:08 UTC 2020 - Stefan Dirsch -- reverted move to /usr/etc/X11/xinit for now (boo#1175123, comment#6) +- reverted move to /usr/etc/X11/xinit for now (boo#1173052, comment#6) ------------------------------------------------------------------- Sat Sep 5 02:48:39 UTC 2020 - Stefan Dirsch diff --git a/xinit.spec b/xinit.spec index 24f4d57..3a77bfd 100644 --- a/xinit.spec +++ b/xinit.spec @@ -16,7 +16,7 @@ # -%define UsrEtcMove 0 +%define UsrEtcMove 1 Name: xinit Version: 1.4.1 @@ -66,7 +66,7 @@ terminate. %prep %setup -q %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} -sed -i 's+/etc+/usr/etc+' %{PATCH0} +sed -i 's+/etc/X11+%{_libexecdir}+' %{PATCH0} %endif %patch0 -p0 %patch1 -p1 @@ -79,7 +79,11 @@ sed -i 's+/etc+/usr/etc+' %{PATCH0} autoreconf -fi %build +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%configure --with-xinitdir=%{_libexecdir}/xinit +%else %configure +%endif make %{?_smp_mflags} %{__cc} %{optflags} -o keygen %{SOURCE2} @@ -91,12 +95,12 @@ pushd %{buildroot} tar xf %{SOURCE1} %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} patch -p0 < %{PATCH5} -mkdir -p usr/etc/X11/xinit +mkdir -p %{buildroot}%{_libexecdir}/xinit +mv etc/X11/xinit/{xinitrc,xserverrc} %{buildroot}%{_libexecdir}/xinit +mkdir -p usr/etc/X11/xinit/xinitrc.d mv etc/X11/Xresources usr/etc/X11 -mv etc/X11/xinit/* usr/etc/X11/xinit -rmdir etc/X11/xinit -rmdir etc/X11 -rmdir etc +mv etc/X11/xinit/xinitrc.common usr/etc/X11/xinit +rmdir -p etc/X11/xinit/xinitrc.d %endif popd @@ -107,6 +111,9 @@ popd %dir %{_distconfdir}/X11 %{_distconfdir}/X11/xinit/ %{_distconfdir}/X11/Xresources +%dir %{_libexecdir}/xinit +%attr(0755,root,root) %{_libexecdir}/xinit/xinitrc +%attr(0755,root,root) %{_libexecdir}/xinit/xserverrc %else %config %{_sysconfdir}/X11/xinit/ %config %{_sysconfdir}/X11/Xresources From 8125fb4431ef2af0d5e016b3f2010a79e532c5678d9ad1f5d1607e3be1bb23cb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Sep 2020 23:24:28 +0000 Subject: [PATCH 8/9] - simplified UsrEtcMove enable/disable logic in specfile OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=57 --- xinit.changes | 5 +++++ xinit.spec | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xinit.changes b/xinit.changes index 250e7ca..8edf44c 100644 --- a/xinit.changes +++ b/xinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 8 23:09:02 UTC 2020 - Stefan Dirsch + +- simplified UsrEtcMove enable/disable logic in specfile + ------------------------------------------------------------------- Tue Sep 8 11:36:36 UTC 2020 - Stefan Dirsch diff --git a/xinit.spec b/xinit.spec index 3a77bfd..38ef66c 100644 --- a/xinit.spec +++ b/xinit.spec @@ -16,7 +16,9 @@ # +%if 0%{?suse_version} >= 1550 %define UsrEtcMove 1 +%endif Name: xinit Version: 1.4.1 @@ -65,7 +67,7 @@ terminate. %prep %setup -q -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} sed -i 's+/etc/X11+%{_libexecdir}+' %{PATCH0} %endif %patch0 -p0 @@ -79,7 +81,7 @@ sed -i 's+/etc/X11+%{_libexecdir}+' %{PATCH0} autoreconf -fi %build -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} %configure --with-xinitdir=%{_libexecdir}/xinit %else %configure @@ -93,7 +95,7 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1 install -m 0711 keygen %{buildroot}%{_bindir}/keygen pushd %{buildroot} tar xf %{SOURCE1} -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} patch -p0 < %{PATCH5} mkdir -p %{buildroot}%{_libexecdir}/xinit mv etc/X11/xinit/{xinitrc,xserverrc} %{buildroot}%{_libexecdir}/xinit @@ -107,7 +109,7 @@ popd %files %defattr(-,root,root) %doc ChangeLog COPYING README.md -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} %dir %{_distconfdir}/X11 %{_distconfdir}/X11/xinit/ %{_distconfdir}/X11/Xresources From 1b63841b6ecb88101a994cb48b5022e7a79783627c508166d5440da0619173fa Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 6 Oct 2020 09:28:49 +0000 Subject: [PATCH 9/9] Accepting request 839677 from home:Vogtinator:branches:X11:XOrg Was lost after superseding the multi-action sr with just xdm - Properly track the compatibility symlink OBS-URL: https://build.opensuse.org/request/show/839677 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=58 --- xinit.changes | 5 +++++ xinit.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/xinit.changes b/xinit.changes index 8edf44c..0d850bd 100644 --- a/xinit.changes +++ b/xinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 4 09:47:55 UTC 2020 - Fabian Vogt + +- Properly track the compatibility symlink + ------------------------------------------------------------------- Tue Sep 8 23:09:02 UTC 2020 - Stefan Dirsch diff --git a/xinit.spec b/xinit.spec index 38ef66c..1acf102 100644 --- a/xinit.spec +++ b/xinit.spec @@ -102,7 +102,9 @@ mv etc/X11/xinit/{xinitrc,xserverrc} %{buildroot}%{_libexecdir}/xinit mkdir -p usr/etc/X11/xinit/xinitrc.d mv etc/X11/Xresources usr/etc/X11 mv etc/X11/xinit/xinitrc.common usr/etc/X11/xinit -rmdir -p etc/X11/xinit/xinitrc.d +# Compatibility symlink for user xinitrc files +ln -s /usr/etc/X11/xinit/xinitrc.common etc/X11/xinit/xinitrc.common +rmdir etc/X11/xinit/xinitrc.d %endif popd @@ -116,6 +118,8 @@ popd %dir %{_libexecdir}/xinit %attr(0755,root,root) %{_libexecdir}/xinit/xinitrc %attr(0755,root,root) %{_libexecdir}/xinit/xserverrc +%dir %{_sysconfdir}/X11/xinit/ +%config %{_sysconfdir}/X11/xinit/xinitrc.common %else %config %{_sysconfdir}/X11/xinit/ %config %{_sysconfdir}/X11/Xresources