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

- xinitrc-common: Load /etc/X11/Xresources with -nocpp

Browse Source
This commit is contained in:
Adam Jackson 2009-03-11 14:09:54 +00:00
parent c92ca0017c
commit 7fe654eb9e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xinitrc-common
View File

@ -27,7 +27,7 @@ sysmodmap=/etc/X11/Xmodmap
sysxkbmap=/etc/X11/Xkbmap sysxkbmap=/etc/X11/Xkbmap
# merge in defaults # merge in defaults
[ -r "$sysresources" ] && xrdb -merge "$sysresources" [ -r "$sysresources" ] && xrdb -nocpp -merge "$sysresources"
[ -r "$userresources" ] && xrdb -merge "$userresources" [ -r "$userresources" ] && xrdb -merge "$userresources"
# merge in keymaps # merge in keymaps

5
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: 5%{?dist} Release: 6%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/xsessions/xinit-compat.desktop %{_datadir}/xsessions/xinit-compat.desktop
%changelog %changelog
* Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.0.9-6
- xinitrc-common: Load /etc/X11/Xresources with -nocpp
* Wed Feb 25 2009 Adam Tkac <atkac redhat com> 1.0.9-5 * Wed Feb 25 2009 Adam Tkac <atkac redhat com> 1.0.9-5
- run ck-xinit-session for all sessions where the xdg cookie isn't already - run ck-xinit-session for all sessions where the xdg cookie isn't already
set (#452156, patch from Patrice Dumas) set (#452156, patch from Patrice Dumas)