rpms/xorg-x11-xdm/F-11 xdm-1.1.6-redhat-Xresources-fix.patch, NONE, 1.1 xorg-x11-xdm.spec, 1.44, 1.45

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/xorg-x11-xdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28729

Modified Files:
	xorg-x11-xdm.spec 
Added Files:
	xdm-1.1.6-redhat-Xresources-fix.patch 
Log Message:
Add forgotten patch for bug 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/pkgs/rpms/xorg-x11-xdm/F-11/xorg-x11-xdm.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- xorg-x11-xdm.spec	10 Jun 2009 20:33:53 -0000	1.44
+++ xorg-x11-xdm.spec	23 Jun 2009 19:32:08 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.1.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT
@@ -26,6 +26,9 @@ Patch11: xdm-1.0.5-sessreg-utmp-fix-bug1
 # cooperating with SELinux, see bug 388431 for more info)
 Patch12: xdm-1.1.6-authDir-var-bug388431.patch
 
+# Fix missing #endif in the Xresources (#470348)
+Patch13: xdm-1.1.6-redhat-Xresources-fix.patch
+
 # FIXME: Temporary build dependencies for autotool dependence.
 BuildRequires: autoconf, automake, libtool
 
@@ -80,6 +83,7 @@ X.Org X11 xdm - X Display Manager
 %patch10 -p0 -b .redhat-xdm-config-fix
 %patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
 %patch12 -p1 -b .authDir-var-bug388431
+%patch13 -p1 -b .redhat-xresources-bug470348
 
 %build
 # FIXME: Work around pointer aliasing warnings from compiler for now
@@ -166,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.1*
 
 %changelog
+* Tue Jun 23 2009 Matěj Cepl <mcepl at redhat.com> - 1:1.1.6-10
+- return lost patch for fixing bug 470348.
+
 * Thu May 14 2009 Matěj Cepl <mcepl at redhat.com> - 1:1.1.6-8
 - Create /var/lib/xdm to make authorization work (bug 500704)