1
0

Accepting request 20317 from X11:XOrg

Copy from X11:XOrg/xorg-x11-server based on submit request 20317 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/20317
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=140
This commit is contained in:
OBS User autobuild 2009-09-16 21:20:07 +00:00 committed by Git OBS Bridge
parent 50bab4cf0c
commit 6297a6f6ae
2 changed files with 19 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 10 15:44:07 CEST 2009 - sndirsch@suse.de
- %post: modify xorg.conf if required
* do not change input driver behaviour for existing X.Org
configurations
-------------------------------------------------------------------
Wed Sep 9 23:29:33 CEST 2009 - sndirsch@suse.de

View File

@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
Release: 52
Release: 53
License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -481,6 +481,17 @@ if [ -f etc/X11/xorg.conf ]; then
sed -i.post_xorg-x11-server -e 's/\"i810\"/\"intel\"/g' \
etc/X11/xorg.conf
fi
# do not change input driver behaviour for existing X.Org configurations
if ! grep -q "will be disabled unless 'Option \"AutoAddDevices\" \"off\"'" etc/X11/xorg.conf; then
sed -i '
/Section "ServerFlags"/{
h
g
a\
Option "AutoAddDevices" "off"
}
' etc/X11/xorg.conf
fi
fi
%endif
# Installation of init script seems to be disabled by default