rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.419, 1.420 xserver-1.6.0-primary.patch, 1.2, 1.3

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec xserver-1.6.0-primary.patch 
Log Message:
* Fri Mar 06 2009 Adam Jackson <ajax at redhat.com> 1.6.0-8
- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- xorg-x11-server.spec	4 Mar 2009 22:51:51 -0000	1.419
+++ xorg-x11-server.spec	6 Mar 2009 18:02:40 -0000	1.420
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -500,6 +500,9 @@
 
 
 %changelog
+* Fri Mar 06 2009 Adam Jackson <ajax at redhat.com> 1.6.0-8
+- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)
+
 * Thu Mar 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-7
 - Remove 10-x11-keymap.fdi, this is provided by fedora-setup-keyboard now.
 

xserver-1.6.0-primary.patch:

Index: xserver-1.6.0-primary.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.0-primary.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xserver-1.6.0-primary.patch	4 Mar 2009 21:25:58 -0000	1.2
+++ xserver-1.6.0-primary.patch	6 Mar 2009 18:02:40 -0000	1.3
@@ -20,7 +20,7 @@
 -	   == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \
 -      || ((((c) & 0x00ffff00) \
 -	   == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) )
-+      || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) )
++      || (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) )
  
  /*
   * PCI classes that have messages printed always.  The others are only