- up to 1.6.1

[packages/xorg-xserver-server.git] / xorg-xserver-server.spec

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index c536c007b43f7357d6c1a9d57adf25eac83ca637..a9d2deaf1c96e0e9b6a60d12a9b1fa66200199a2 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -17,18 +17,20 @@
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.6.0
-Release:       5%{?with_multigl:.mgl}
+Version:       1.6.1
+Release:       1%{?with_multigl:.mgl}
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: aafe73f5807ce8bb534727ecb72467c7
+# Source0-md5: ed0878bf32a24d4948c3b8a122a39eff
 Source2:       xserver.pamd
 Patch0:                %{name}-xwrapper.patch
 Patch1:                %{name}-pic-libxf86config.patch
 Patch2:                %{name}-fb-size.patch
 Patch3:                %{name}-exa.patch
 Patch4:                %{name}-xinerama-bug20557.patch
+Patch5:                %{name}-xinerama-cursors.patch
+Patch6:                %{name}-less-acpi-brokenness.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel >= 7.3
 # for glx headers
@@ -256,7 +258,9 @@ Summary(pl.UTF-8):  Pliki nagłówkowe dla servera X.org
 Group:         X11/Development/Libraries
 Requires:      libdrm-devel >= 2.4.5
 Requires:      pixman-devel >= 0.14.0
+Requires:      xorg-lib-libpciaccess-devel
 Requires:      xorg-lib-libxkbfile-devel
+Requires:      xorg-proto-dri2proto-devel
 Requires:      xorg-proto-fontsproto-devel
 Requires:      xorg-proto-renderproto-devel >= 0.9.3
 Requires:      xorg-proto-videoproto-devel
@@ -317,6 +321,8 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -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