rpms/xorg-x11-xinit/devel xinitrc-common, 1.5, 1.6 xorg-x11-xinit.spec, 1.63, 1.64

Adam Jackson ajax at fedoraproject.org
Wed Mar 11 14:10:24 UTC 2009


Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31161

Modified Files:
	xinitrc-common xorg-x11-xinit.spec 
Log Message:
* Wed Mar 11 2009 Adam Jackson <ajax at redhat.com> 1.0.9-6
- xinitrc-common: Load /etc/X11/Xresources with -nocpp



Index: xinitrc-common
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinitrc-common,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xinitrc-common	25 Feb 2009 09:57:22 -0000	1.5
+++ xinitrc-common	11 Mar 2009 14:09:54 -0000	1.6
@@ -27,7 +27,7 @@
 sysxkbmap=/etc/X11/Xkbmap
 
 # merge in defaults
-[ -r "$sysresources" ] && xrdb -merge "$sysresources"
+[ -r "$sysresources" ] && xrdb -nocpp -merge "$sysresources"
 [ -r "$userresources" ] && xrdb -merge "$userresources"
 
 # merge in keymaps


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- xorg-x11-xinit.spec	25 Feb 2009 09:57:22 -0000	1.63
+++ xorg-x11-xinit.spec	11 Mar 2009 14:09:54 -0000	1.64
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.9
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   MIT
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -129,6 +129,9 @@
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Wed Mar 11 2009 Adam Jackson <ajax at 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
 - run ck-xinit-session for all sessions where the xdg cookie isn't already
   set (#452156, patch from Patrice Dumas)




More information about the fedora-extras-commits mailing list