From 68b3d6bdfd1ff8999b3c6142951da0611e46b6bcd3360f1006098459e5baf0a2 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 1 Oct 2012 18:08:05 +0000
Subject: [PATCH] Accepting request 135729 from home:cboltz:branches:X11:XOrg

(see https://bugzilla.novell.com/show_bug.cgi?id=632737#c27 for details)

- /usr/bin/Xorg is no longer listed in /etc/permissions - remove
  %set_permissions and %verify_permissions and re-enable rpm permission
  check (bnc#632737 #c27)

OBS-URL: https://build.opensuse.org/request/show/135729
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=414
---
 xorg-x11-server.changes | 7 +++++++
 xorg-x11-server.spec    | 8 +-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index dd9792b..faa0bfc 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 24 19:52:16 UTC 2012 - opensuse@cboltz.de
+
+- /usr/bin/Xorg is no longer listed in /etc/permissions - remove 
+  %set_permissions and %verify_permissions and re-enable rpm permission
+  check (bnc#632737 #c27)
+
 -------------------------------------------------------------------
 Thu Sep 20 11:34:01 UTC 2012 - sndirsch@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3564f2f..8cd3a61 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -400,15 +400,9 @@ install -m 644 %_sourcedir/sysconfig.displaymanager.template \
 install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace
 install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-server
 
-%ifnarch s390 s390x
-%verifyscript
-%verify_permissions -e /usr/bin/Xorg
-%endif
-
 %post
 %ifnarch s390 s390x
 %{fillup_only -an displaymanager}
-%set_permissions /usr/bin/Xorg
 if [ -f etc/X11/xorg.conf ]; then
  # Document how to restore previous input driver behaviour in xorg.conf files created
  # on openSUSE <= 11.1
@@ -453,7 +447,7 @@ exit 0
 %{_localstatedir}/lib/xkb/compiled/README.compiled
 %ifnarch s390 s390x
 %{_sysconfdir}/modprobe.d/50-nvidia.conf
-%verify(not mode) %{_bindir}/Xorg
+%{_bindir}/Xorg
 %{_bindir}/X
 %{_bindir}/cvt
 %{_bindir}/gtf