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

- %post:

Browse Source 
* move SaX2 generated xorg.conf file to xorg.conf.sle11
    Only in very rare cases a static X configuration is still
    required on sle12. And, in some cases the migration from a
    static sle11 X configuration to a static sle12 X configuration
    is not possible at all, e.g. some video and input drivers
    are no longer available on sle12. In short, trying to migrate
    will result in more harm than benefit. (bnc#877315)
  * remove dangling link /etc/X11/XF86Config (bnc#879360, comment#15)
  * prevent %postun of NVIDIA/fglrx driver packages from
    restoring xorg.conf backup or running sax2 as fallback
    to create a new xorg.conf (bcn#877315)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=519
This commit is contained in:
Stefan Dirsch 2014-05-28 11:03:19 +00:00 committed by Git OBS Bridge
parent ebc18c5647
commit 5cd006c211
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xorg-x11-server.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed May 28 11:00:49 UTC 2014 - sndirsch@suse.com
- %post:
* move SaX2 generated xorg.conf file to xorg.conf.sle11
Only in very rare cases a static X configuration is still
required on sle12. And, in some cases the migration from a
static sle11 X configuration to a static sle12 X configuration
is not possible at all, e.g. some video and input drivers
are no longer available on sle12. In short, trying to migrate
will result in more harm than benefit. (bnc#877315)
* remove dangling link /etc/X11/XF86Config (bnc#879360, comment#15)
* prevent %postun of NVIDIA/fglrx driver packages from
restoring xorg.conf backup or running sax2 as fallback
to create a new xorg.conf (bcn#877315)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 24 09:16:08 UTC 2014 - eich@suse.com Sat May 24 09:16:08 UTC 2014 - eich@suse.com

36
xorg-x11-server.spec
View File

@ -340,23 +340,27 @@ install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-ser
%post %post
%ifnarch s390 s390x %ifnarch s390 s390x
%{fillup_only -an displaymanager} %{fillup_only -an displaymanager}
if [ -f etc/X11/xorg.conf ]; then # Move SaX2 generated xorg.conf file to xorg.conf.sle11
# Document how to restore previous input driver behaviour in xorg.conf files created #
# on openSUSE <= 11.1 # Only in very rare cases a static X configuration is still
if ! grep -q "will be disabled unless 'Option \"AutoAddDevices\" \"off\"'" etc/X11/xorg.conf; then # required on sle12. And, in some cases the migration from a
if ! grep -q "\"AutoAddDevices\" \"off\"" etc/X11/xorg.conf; then # static sle11 X configuration to a static sle12 X configuration
sed -i ' # is not possible at all, e.g. some video and input drivers
/Section "ServerFlags"/{ # are no longer available on sle12. In short, trying to migrate
h # will result in more harm than benefit.
g if [ -f etc/X11/xorg.conf -a ! -f etc/X11/xorg.conf.sle11 ]; then
a\ echo "xorg.conf exists and xorg.conf.sle11 does not"
# Uncomment the following option to reenable kbd/mouse driver input sections. \ if grep -q "SaX generated X11 config file" etc/X11/xorg.conf; then
# Otherwise evdev driver is used. \ echo "move SaX generated xorg.conf to xorg.conf.sle11"
#Option "AutoAddDevices" "off" mv etc/X11/xorg.conf{,.sle11}
} # remove dangling link (bnc#879360, comment#15)
' etc/X11/xorg.conf rm -f etc/X11/XF86Config
# prevent %postun of NVIDIA/fglrx driver packages from restoring xorg.conf
# backup or running sax2 as fallback to create a new xorg.conf (bcn#877315)
rm -f etc/X11/xorg.conf.nvidia-post \
etc/X11/xorg.conf.fglrx-post
chmod -x usr/sbin/sax2
fi fi
fi
fi fi
%endif %endif
exit 0 exit 0