- rel 2

- reenable Ctrl-Alt-Backspace by default

Changed files:
    xorg-xserver-server.spec -> 1.185

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index a9d2deaf1c96e0e9b6a60d12a9b1fa66200199a2..00714c3f19b6a1a35916ec5593815475103c6b73 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -18,7 +18,7 @@ Summary:      X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
 Version:       1.6.1
-Release:       1%{?with_multigl:.mgl}
+Release:       2%{?with_multigl:.mgl}
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch3:               %{name}-exa.patch
 Patch4:                %{name}-xinerama-bug20557.patch
 Patch5:                %{name}-xinerama-cursors.patch
 Patch6:                %{name}-less-acpi-brokenness.patch
+Patch7:                %{name}-zap.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel >= 7.3
 # for glx headers
@@ -323,6 +324,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h