From a7f984237153bc252d4c4494115e7c7645b83cf6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mar 11 2009 17:02:03 +0000 Subject: * Wed Mar 11 2009 Adam Jackson 1.6.0-10 - xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy says to be an object manager. --- diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 7f98aab..15ecd99 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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 @@ Patch6010: xserver-1.5.99.902-selinux-debugging.patch # 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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 11 2009 Adam Jackson 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 1.6.0-9 - BR kernel-headers not kernel-devel