From 1b63841b6ecb88101a994cb48b5022e7a79783627c508166d5440da0619173fa Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 6 Oct 2020 09:28:49 +0000 Subject: [PATCH] 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