forked from pool/xorg-x11-server
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
7d16209f3a
commit
5421fee007
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 24 16:26:23 CET 2008 - sndirsch@suse.de
|
||||
|
||||
- only switch to radeon driver in %post if radeonold driver is no
|
||||
longer available (Bug #355009)
|
||||
- some more cleanup in %post
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 24 11:41:44 CET 2008 - schwab@suse.de
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
|
||||
Url: http://xorg.freedesktop.org/
|
||||
%define EXPERIMENTAL 0
|
||||
Version: 7.3
|
||||
Release: 51
|
||||
Release: 53
|
||||
License: X11/MIT
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Group: System/X11/Servers/XF86_4
|
||||
@ -395,55 +395,25 @@ pushd etc/X11 &> /dev/null
|
||||
fi
|
||||
popd &> /dev/null
|
||||
if [ -f etc/X11/xorg.conf ]; then
|
||||
# keyboard driver specification seems to be case-sensitive now :-(
|
||||
# SLES9 SPx --> SLES10: i915 --> i810 driver
|
||||
# SuSE 9.3 --> SuSE 10.0: xgi --> sis driver
|
||||
# SuSE 9.3 --> SuSE 10.0: cz_qwerty,us --> cz(qwerty,basic) keyboard map
|
||||
# SuSE 9.3 --> SuSE 10.0: sk_qwerty,us --> sk(qwerty,basic) keyboard map
|
||||
# SuSE 9.3 --> SuSE 10.0: el --> gr keyboard map
|
||||
# SuSE 10.0 --> SuSE 10.1: r128 --> ati driver
|
||||
# SuSE 9.0 --> SuSE 9.1: /dev/mouse --> /dev/input/mice (Bug #172260)
|
||||
# SuSE 10.1 --> SuSE 10.2: X11 fonts have moved to /usr/share/fonts
|
||||
# SuSE 10.1 --> SuSE 10.2: radeonold/radeon10b --> radeon
|
||||
# SuSE 10.2 --> SUSE 10.3: i810beta --> intel
|
||||
if grep -q -e \"[kK]eyboard\" \
|
||||
-e \"i915\" \
|
||||
-e \"xgi\" \
|
||||
-e \"r128\" \
|
||||
-e \"radeonold\" \
|
||||
-e \"radeon10b\" \
|
||||
-e \"i810beta\" \
|
||||
-e \"/dev/mouse\" \
|
||||
-e /usr/X11R6/lib/X11/fonts/ \
|
||||
# SuSE 10.1 --> SuSE 10.2: radeonold --> radeon
|
||||
if grep -q -e /usr/X11R6/lib/X11/fonts/ \
|
||||
-e /usr/X11/lib/X11/fonts/ \
|
||||
-e /usr/lib/X11/fonts/ \
|
||||
-e _qwerty \
|
||||
-e \"el\" \
|
||||
etc/X11/xorg.conf; then
|
||||
sed -i.post_xorg-x11-server \
|
||||
-e 's/\"[kK]eyboard\"/\"kbd\"/g' \
|
||||
-e 's/\"i915\"/\"i810\"/g' \
|
||||
-e 's/\"xgi\"/\"sis\"/g' \
|
||||
-e 's/\"r128\"/\"ati\"/g' \
|
||||
-e 's/\"radeonold\"/\"radeon\"/g' \
|
||||
-e 's/\"radeon10b\"/\"radeon\"/g' \
|
||||
-e 's/\"i810beta\"/\"intel\"/g' \
|
||||
-e 's+/dev/mouse+/dev/input/mice+g' \
|
||||
-e 's+/usr/X11R6/lib/X11/fonts/+/usr/share/fonts/+g' \
|
||||
-e 's+/usr/X11/lib/X11/fonts/+/usr/share/fonts/+g' \
|
||||
-e 's+/usr/lib/X11/fonts/+/usr/share/fonts/+g' \
|
||||
-e '
|
||||
/\"XkbLayout\".*\".*_qwerty,us\"/{
|
||||
h
|
||||
g
|
||||
a\
|
||||
Option\t"XkbVariant" "qwerty,basic"
|
||||
}
|
||||
' \
|
||||
-e s/_qwerty//g \
|
||||
-e s/\"el\"/\"gr\"/g \
|
||||
etc/X11/xorg.conf
|
||||
fi
|
||||
if grep -q \"radeonold\" etc/X11/xorg.conf; then
|
||||
# only switch to radeon if radeonold is no longer available (Bug #355009)
|
||||
if test ! -f /usr/%{_lib}/xorg/modules/drivers/radeonold_drv.so; then
|
||||
sed -i.post_xorg-x11-server -e 's/\"radeonold\"/\"radeon\"/g' \
|
||||
etc/X11/xorg.conf
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
%endif
|
||||
# Installation of init script seems to be disabled by default
|
||||
@ -569,6 +539,10 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jan 24 2008 sndirsch@suse.de
|
||||
- only switch to radeon driver in %%post if radeonold driver is no
|
||||
longer available (Bug #355009)
|
||||
- some more cleanup in %%post
|
||||
* Thu Jan 24 2008 schwab@suse.de
|
||||
- Move manpage to the sub package that provides the binary.
|
||||
* Wed Jan 23 2008 sndirsch@suse.de
|
||||
@ -602,7 +576,7 @@ exit 0
|
||||
* CVE-2007-6428 - TOG-cup extension memory corruption.
|
||||
* CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
|
||||
* CVE-2008-0006 - PCF Font parser buffer overflow.
|
||||
* Wed Dec 12 2007 sndirsch@suse.de
|
||||
* Thu Dec 13 2007 sndirsch@suse.de
|
||||
- xorg-server 1.4.0.90 (prerelease of 1.4.1)
|
||||
* Fri Nov 30 2007 sndirsch@suse.de
|
||||
- pixman.diff
|
||||
@ -621,7 +595,7 @@ exit 0
|
||||
* Only clear crtc of output if it is the one we're actually working on.
|
||||
- commit-fa19e84.diff
|
||||
* Fix initial placement of LeftOf and Above.
|
||||
* Thu Nov 22 2007 sndirsch@suse.de
|
||||
* Fri Nov 23 2007 sndirsch@suse.de
|
||||
- pixman.diff no longer required
|
||||
* Sun Nov 18 2007 sndirsch@suse.de
|
||||
- s390(x): allow mfb build without Xorg server being built
|
||||
@ -639,7 +613,7 @@ exit 0
|
||||
- ia64linuxPciInit: allocate extra space for fake devices.
|
||||
* Sat Nov 10 2007 sndirsch@suse.de
|
||||
- updated to Mesa 7.0.2 (final) sources
|
||||
* Wed Oct 31 2007 sndirsch@suse.de
|
||||
* Thu Nov 01 2007 sndirsch@suse.de
|
||||
- updated to Mesa 7.0.2 RC1 sources
|
||||
* Tue Oct 23 2007 sndirsch@suse.de
|
||||
- xorg-server-1.4-vnc-64bit.diff
|
||||
@ -739,10 +713,10 @@ exit 0
|
||||
- use-composite-for-unequal-depths.patch:
|
||||
* Use Composite when depths don't match (Bug #309107, X.Org Bug
|
||||
[#7447])
|
||||
* Fri Sep 07 2007 schwab@suse.de
|
||||
* Sat Sep 08 2007 schwab@suse.de
|
||||
- Update off-by-one patch.
|
||||
- Remove empty patch.
|
||||
* Mon Sep 03 2007 sndirsch@suse.de
|
||||
* Tue Sep 04 2007 sndirsch@suse.de
|
||||
- fbdevhw.diff:
|
||||
* ignore pixclock set to 0 by Xen kernel (Bug #285523)
|
||||
* Fri Aug 31 2007 sndirsch@suse.de
|
||||
@ -1270,7 +1244,7 @@ exit 0
|
||||
tarball (Bug #204110)
|
||||
- added a check to specfile to make sure that these will not be
|
||||
reintroduced with the next Mesa update again (Bug #204110)
|
||||
* Fri Sep 01 2006 sndirsch@suse.de
|
||||
* Sat Sep 02 2006 sndirsch@suse.de
|
||||
- moved xf86Parser.h,xf86Optrec.h back to /usr/include/xorg, since
|
||||
SaX2 build issues have finally been resolved by making use of
|
||||
"-iquote /usr/include/xorg -I."
|
||||
|
||||
Loading…
Reference in New Issue
Block a user