- updated devel dependency on inputproto

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

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 240d73223c08d9a84785e46c208fb4664a3dbdfa..0e594aa0e1c5e1525bc47d08dfcbc70582799587 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -15,40 +15,38 @@
 %define        xorg_xserver_server_ansic_abi           0.4
 %define        xorg_xserver_server_extension_abi       7.0
 %define        xorg_xserver_server_font_abi            0.6
-%define        xorg_xserver_server_videodrv_abi        13.0
-%define        xorg_xserver_server_xinput_abi          18.0
+%define        xorg_xserver_server_videodrv_abi        14.1
+%define        xorg_xserver_server_xinput_abi          19.1
 #
 %define        pixman_ver      0.28.0
 
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.13.0
-Release:       3
+Version:       1.14.0
+Release:       1
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: bde3d178b756597d2ec2a19ef60d2e1f
+# Source0-md5: 86110278b784e279381b7f6f2295c508
 Source1:       10-quirks.conf
 Source2:       xserver.pamd
 Source10:      %{name}-Xvfb.init
 Source11:      %{name}-Xvfb.sysconfig
 Patch0:                %{name}-xwrapper.patch
 Patch1:                %{name}-pic-libxf86config.patch
-Patch2:                pixman-cache.patch
+
 Patch3:                %{name}-less-acpi-brokenness.patch
 Patch4:                %{name}-builtin-SHA1.patch
 Patch5:                %{name}-export-GetMaster.patch
 Patch6:                110_nvidia_slowdow_fix.patch
 Patch7:                %{name}-include-defs.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=54654
-Patch8:                0001-dix-fix-zaphod-screen-scrossing-54654.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel >= 7.8.1
 # for glx headers
 BuildRequires: OpenGL-GLX-devel
 %{?with_xselinux:BuildRequires:        audit-libs-devel}
-BuildRequires: autoconf >= 2.57
+BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: cpp
 BuildRequires: docbook-dtd43-xml
@@ -102,7 +100,7 @@ BuildRequires:      xorg-proto-fixesproto-devel >= 5.0
 BuildRequires: xorg-proto-fontcacheproto-devel
 BuildRequires: xorg-proto-fontsproto-devel
 BuildRequires: xorg-proto-glproto-devel >= 1.4.16
-BuildRequires: xorg-proto-inputproto-devel >= 2.2
+BuildRequires: xorg-proto-inputproto-devel >= 2.2.99.1
 BuildRequires: xorg-proto-kbproto-devel >= 1.0.3
 BuildRequires: xorg-proto-printproto-devel
 BuildRequires: xorg-proto-randrproto-devel >= 1.4.0
@@ -306,7 +304,7 @@ Requires:   xorg-lib-libpciaccess-devel >= 0.12.901
 Requires:      xorg-lib-libxkbfile-devel
 %{?with_dri2:Requires: xorg-proto-dri2proto-devel >= 2.8}
 Requires:      xorg-proto-fontsproto-devel
-Requires:      xorg-proto-inputproto-devel >= 2.2
+Requires:      xorg-proto-inputproto-devel >= 2.2.99.1
 Requires:      xorg-proto-kbproto-devel >= 1.0.3
 Requires:      xorg-proto-randrproto-devel >= 1.4.0
 Requires:      xorg-proto-renderproto-devel >= 0.11
@@ -358,7 +356,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %setup -q -n xorg-server-%{version}
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
+
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -367,8 +365,6 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 #unfortunately breaks build
 #patch7 -p1
 
-%patch8 -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