rpms/xorg-x11-server/devel xorg-x11-server.spec,1.421,1.422

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Mar 11 2009 Adam Jackson <ajax at redhat.com> 1.6.0-10
- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy
  says to be an object manager.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- xorg-x11-server.spec	6 Mar 2009 23:40:09 -0000	1.421
+++ xorg-x11-server.spec	11 Mar 2009 17:02:03 -0000	1.422
@@ -9,7 +9,7 @@
 # check out the master branch, pull, cherry-pick, and push.  FIXME describe
 # rebasing, add convenience 'make' targets maybe.
 
-# F10 TODO list:
+# F11 TODO list:
 #
 # Fix rhpxl to no longer need vesamodes/extramodes
 
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.0
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -78,6 +78,9 @@
 # don't try intel on poulsbo
 Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch
 
+# don't do selinux if we're not told to
+Patch6014: xserver-1.6.0-selinux-less.patch
+
 # https://bugs.freedesktop.org/show_bug.cgi?id=20087
 Patch6015: xserver-1.5.99.902-vnc.patch
 
@@ -500,6 +503,10 @@
 
 
 %changelog
+* Wed Mar 11 2009 Adam Jackson <ajax at redhat.com> 1.6.0-10
+- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy
+  says to be an object manager.
+
 * Fri Mar 06 2009 Dennis Gilmore <dennis at ausil.us> 1.6.0-9
 - BR kernel-headers not kernel-devel