[xorg-x11-server/f14/master] limit caps to f15, since we're feature frozen

[Adam Jackson]

commit 3cf586148679afb709e187168d2c65bd0329e379
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Sep 2 16:38:39 2010 -0400

    limit caps to f15, since we're feature frozen

 xorg-x11-server.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index c7e6a5c..26fe63c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -30,7 +30,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.9.0
-Release:   6%{?gitdate:.%{gitdate}}%{dist}
+Release:   7%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -440,14 +440,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/lib/xkb
 %{_localstatedir}/lib/xkb/README.compiled
 
+%if 0%{?fedora} < 15
+%define Xorgperms %attr(4711, root, root)
+%else
+%define Xorgperms %attr(0711,root,root) %caps(cap_sys_admin,cap_sys_rawio,cap_dac_override=pe)
+%endif
 
 %if %{with_hw_servers}
 %files Xorg
 %defattr(-,root,root,-)
 %config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver
 %{_bindir}/X
-#attr(4711, root, root) %{_bindir}/Xorg
-%attr(0711,root,root) %caps(cap_sys_admin,cap_sys_rawio,cap_dac_override=pe) %{_bindir}/Xorg
+%{Xorgperms} %{_bindir}/Xorg
 %{_bindir}/cvt
 %{_bindir}/gtf
 %dir %{_datadir}/xorg
@@ -550,6 +554,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Sep 02 2010 Adam Jackson <ajax at redhat.com> 1.9.0-7
+- ... but only in F15 and later.
+
 * Thu Sep 02 2010 Adam Jackson <ajax at redhat.com> 1.9.0-5
 - Drop the SUID bit from Xorg, use fs caps instead.