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
This commit is contained in:
Stefan Dirsch 2020-10-06 09:28:49 +00:00 committed by Git OBS Bridge
parent 8125fb4431
commit 1b63841b6e
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Oct 4 09:47:55 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Properly track the compatibility symlink
-------------------------------------------------------------------
Tue Sep 8 23:09:02 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -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