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

Accepting request 22584 from X11:XOrg

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

OBS-URL: https://build.opensuse.org/request/show/22584
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=149
This commit is contained in:
OBS User autobuild 2009-10-21 00:06:49 +00:00 committed by Git OBS Bridge
parent 16f8af538f
commit f8a3ea5245
2 changed files with 15 additions and 3 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 Oct 19 15:16:22 CEST 2009 - sndirsch@suse.de
- add 'Option "AutoAddDevices" "off"' to xorg.conf only as
documented comment, since it caused a lot of confusion
(bnc #548085 and various others)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 12 16:48:47 CEST 2009 - sndirsch@suse.de Mon Oct 12 16:48:47 CEST 2009 - sndirsch@suse.de

11
xorg-x11-server.spec
View File

@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 60 Release: 61
License: GPL v2 or later ; MIT License (or similar) License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -487,16 +487,21 @@ if [ -f etc/X11/xorg.conf ]; then
sed -i.post_xorg-x11-server -e 's/\"i810\"/\"intel\"/g' \ sed -i.post_xorg-x11-server -e 's/\"i810\"/\"intel\"/g' \
etc/X11/xorg.conf etc/X11/xorg.conf
fi fi
# do not change input driver behaviour for existing X.Org configurations # Document how to restore previous input driver behaviour in xorg.conf files created
# on openSUSE <= 11.1
if ! grep -q "will be disabled unless 'Option \"AutoAddDevices\" \"off\"'" etc/X11/xorg.conf; then if ! grep -q "will be disabled unless 'Option \"AutoAddDevices\" \"off\"'" etc/X11/xorg.conf; then
if ! grep -q "\"AutoAddDevices\" \"off\"" etc/X11/xorg.conf; then
sed -i ' sed -i '
/Section "ServerFlags"/{ /Section "ServerFlags"/{
h h
g g
a\ a\
Option "AutoAddDevices" "off" # Uncomment the following option to reenable kbd/mouse driver input sections. \
# Otherwise evdev driver is used. \
#Option "AutoAddDevices" "off"
} }
' etc/X11/xorg.conf ' etc/X11/xorg.conf
fi
fi fi
fi fi
%endif %endif