rpms/xorg-x11-server/F-8 xorg-x11-server.spec, 1.269, 1.270 xserver-1.3.0-avoid-ps2-probe.patch, 1.1, 1.2

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1732

Modified Files:
	xorg-x11-server.spec xserver-1.3.0-avoid-ps2-probe.patch 
Log Message:
* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 1.3.0.0-42
- xserver-1.3.0-avoid-ps2-probe.patch: Delete an irrelevant hunk against
  the module loader that broke Xorg -configure.  (#397461)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-8/xorg-x11-server.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- xorg-x11-server.spec	11 Feb 2008 20:02:34 -0000	1.269
+++ xorg-x11-server.spec	12 Feb 2008 16:46:24 -0000	1.270
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   41%{?dist}
+Release:   42%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -643,6 +643,10 @@
 
 
 %changelog
+* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 1.3.0.0-42
+- xserver-1.3.0-avoid-ps2-probe.patch: Delete an irrelevant hunk against
+  the module loader that broke Xorg -configure.  (#397461)
+
 * Mon Feb 11 2008 Adam Jackson <ajax at redhat.com> 1.3.0.0-41
 - xserver-1.3.0-xorg-conf-man-randr-update.patch: Various fixes. (#429988)
 

xserver-1.3.0-avoid-ps2-probe.patch:

Index: xserver-1.3.0-avoid-ps2-probe.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-8/xserver-1.3.0-avoid-ps2-probe.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-avoid-ps2-probe.patch	11 Oct 2007 14:11:57 -0000	1.1
+++ xserver-1.3.0-avoid-ps2-probe.patch	12 Feb 2008 16:46:25 -0000	1.2
@@ -1,26 +1,3 @@
-diff -up xorg-server-1.3.0.0/hw/xfree86/loader/loadmod.c.jx xorg-server-1.3.0.0/hw/xfree86/loader/loadmod.c
---- xorg-server-1.3.0.0/hw/xfree86/loader/loadmod.c.jx	2007-04-16 12:37:51.000000000 -0400
-+++ xorg-server-1.3.0.0/hw/xfree86/loader/loadmod.c	2007-10-10 19:13:47.000000000 -0400
-@@ -408,7 +408,8 @@ FindModuleInSubdir(const char *dirpath, 
-     while ((direntry = readdir(dir))) {
-         if (direntry->d_name[0] == '.')
-             continue;
--        if ((stat(direntry->d_name, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
-+
-+	if (direntry->d_type == DT_DIR) {
-             snprintf(tmpBuf, PATH_MAX, "%s/%s", dirpath, direntry->d_name);
-             if ((ret = FindModuleInSubdir(tmpBuf, module)))
-                 break;
-@@ -525,8 +526,7 @@ LoaderListDirs(const char **subdirlist, 
- 		    if (dirlen + strlen(dp->d_name) > PATH_MAX)
- 			continue;
- 		    strcpy(fp, dp->d_name);
--		    if (!(stat(buf, &stat_buf) == 0 &&
--			  S_ISREG(stat_buf.st_mode)))
-+		    if (dp->d_type == DT_REG)
- 			continue;
- 		    for (p = patterns; p->pattern; p++) {
- 			if (regexec(&p->rex, dp->d_name, 2, match, 0) == 0 &&
 diff -up xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_mouse.c.jx xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_mouse.c
 --- xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_mouse.c.jx	2006-09-18 02:04:18.000000000 -0400
 +++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_mouse.c	2007-10-11 09:53:33.000000000 -0400