rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 135729 from home:cboltz:branches:X11:XOrg

Browse Source 
(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
This commit is contained in:
Stefan Dirsch 2012-10-01 18:08:05 +00:00 committed by Git OBS Bridge
parent a92f08ad3c
commit 68b3d6bdfd
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xorg-x11-server.changes
View File

@ -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 Thu Sep 20 11:34:01 UTC 2012 - sndirsch@suse.com

8
xorg-x11-server.spec
View File

@ -400,15 +400,9 @@ install -m 644 %_sourcedir/sysconfig.displaymanager.template \
install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace
install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-server install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-server
%ifnarch s390 s390x
%verifyscript
%verify_permissions -e /usr/bin/Xorg
%endif
%post %post
%ifnarch s390 s390x %ifnarch s390 s390x
%{fillup_only -an displaymanager} %{fillup_only -an displaymanager}
%set_permissions /usr/bin/Xorg
if [ -f etc/X11/xorg.conf ]; then if [ -f etc/X11/xorg.conf ]; then
# Document how to restore previous input driver behaviour in xorg.conf files created # Document how to restore previous input driver behaviour in xorg.conf files created
# on openSUSE <= 11.1 # on openSUSE <= 11.1
@ -453,7 +447,7 @@ exit 0
%{_localstatedir}/lib/xkb/compiled/README.compiled %{_localstatedir}/lib/xkb/compiled/README.compiled
%ifnarch s390 s390x %ifnarch s390 s390x
%{_sysconfdir}/modprobe.d/50-nvidia.conf %{_sysconfdir}/modprobe.d/50-nvidia.conf
%verify(not mode) %{_bindir}/Xorg %{_bindir}/Xorg
%{_bindir}/X %{_bindir}/X
%{_bindir}/cvt %{_bindir}/cvt
%{_bindir}/gtf %{_bindir}/gtf