rpms/xorg-x11-xinit
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Move xinit-compat.desktop complicated logic to special script (resolves

Browse Source 
#540546)
This commit is contained in:
Matej Cepl 2010-02-03 23:12:07 +00:00
parent b570440bb2
commit 754cfa67d2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xinit-compat.desktop
View File

@ -1,4 +1,4 @@
[Desktop Entry] [Desktop Entry]
Name=User script Name=User script
Comment=This session runs ~/.xsession or ~/.Xclients if available Comment=This session runs ~/.xsession or ~/.Xclients if available
Exec=sh -c "exec ~/.xsession || exec ~/.Xclients || exec /etc/X11/xinit/Xclients" Exec=/usr/libexec/xinit-compat

11
xorg-x11-xinit.spec
View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 1.0.9 Version: 1.0.9
Release: 14%{?dist} Release: 15%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -20,7 +20,7 @@ Source14: Xresources
Source16: Xsession Source16: Xsession
Source17: localuser.sh Source17: localuser.sh
Source18: xinit-compat.desktop Source18: xinit-compat.desktop
Source11: xinit-compat Source19: xinit-compat
Source100: ck-xinit-session.c Source100: ck-xinit-session.c
Patch1: xinit-1.0.2-client-session.patch Patch1: xinit-1.0.2-client-session.patch
@ -103,6 +103,9 @@ install -m644 -D $RPM_SOURCE_DIR/xinit-compat.desktop $RPM_BUILD_ROOT%{_datadir}
install -m 755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh install -m 755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/Xclients.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/Xclients.d
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
install -m 755 %{SOURCE19} $RPM_BUILD_ROOT%{_libexecdir}
} }
%clean %clean
@ -114,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/startx %{_bindir}/startx
%{_bindir}/xinit %{_bindir}/xinit
%{_bindir}/ck-xinit-session %{_bindir}/ck-xinit-session
%{_libexecdir}/xinit-compat
%dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit
%{_sysconfdir}/X11/xinit/xinitrc %{_sysconfdir}/X11/xinit/xinitrc
%{_sysconfdir}/X11/xinit/xinitrc-common %{_sysconfdir}/X11/xinit/xinitrc-common
@ -133,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/xsessions/xinit-compat.desktop %{_datadir}/xsessions/xinit-compat.desktop
%changelog %changelog
* Thu Feb 04 2010 Matěj Cepl <mcepl@redhat.com> - 1.0.9-15
- Add xinit-compat script
* Fri Jan 29 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.0.9-14 * Fri Jan 29 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.0.9-14
- Eliminate dependency on which. - Eliminate dependency on which.
- Change Xclients, Xsession and xinitrc-common to make fewer stat calls. - Change Xclients, Xsession and xinitrc-common to make fewer stat calls.