rpms/xorg-x11-xdm/F-10 xdm-1.1.6-redhat-Xresources-fix.patch, NONE, 1.1 xorg-x11-xdm.spec, 1.39, 1.40

[Matej Cepl]

Author: mcepl

Update of /cvs/extras/rpms/xorg-x11-xdm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9566

Modified Files:
	xorg-x11-xdm.spec 
Added Files:
	xdm-1.1.6-redhat-Xresources-fix.patch 
Log Message:
wrong Xresources generated, #470348

xdm-1.1.6-redhat-Xresources-fix.patch:

--- NEW FILE xdm-1.1.6-redhat-Xresources-fix.patch ---
diff -up xdm-1.1.6/config/Xresources.cpp.bug470348 xdm-1.1.6/config/Xresources.cpp
--- xdm-1.1.6/config/Xresources.cpp.bug470348	2007-06-16 04:25:22.000000000 +0200
+++ xdm-1.1.6/config/Xresources.cpp	2008-11-07 22:03:29.000000000 +0100
@@ -36,6 +36,7 @@ xlogin*greetFace:	Serif-24:bold:italic
 xlogin*face: 		Helvetica-18
 xlogin*promptFace: 	Helvetica-18:bold
 xlogin*failFace: 	Helvetica-18:bold
+XHASHendif
 
 XHASHifdef COLOR
 xlogin*borderWidth: 1


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-xdm/F-10/xorg-x11-xdm.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-xdm.spec	30 Oct 2008 18:15:46 -0000	1.39
+++ xorg-x11-xdm.spec	7 Nov 2008 22:41:34 -0000	1.40
@@ -22,6 +22,9 @@
 Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
 Patch11: xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
 
+# Fix missing #endif in the Xresources (#470348)
+Patch12: xdm-1.1.6-redhat-Xresources-fix.patch
+
 # FIXME: Temporary build dependencies for autotool dependence.
 BuildRequires: autoconf, automake, libtool
 
@@ -75,6 +78,7 @@
 
 %patch10 -p0 -b .redhat-xdm-config-fix
 %patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
+%patch12 -p1 -b .redhat-xresources-bug470348
 
 %build
 # FIXME: Work around pointer aliasing warnings from compiler for now