This commit was manufactured by cvs2git to create branch 'XORG_XSERVER_1_8'.

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

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 22bb727567845c93b8d9218c1f40d4e0f7718099..f4f3873b11c9f61afd04191a12b1a767571540ac 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -6,7 +6,7 @@
 %bcond_with    hal     # HAL support
 %bcond_without udev    # UDEV support
 %bcond_without dmx     # DMX support
-%bcond_with    record  # RECORD extension
+%bcond_without record  # RECORD extension
 #
 # ABI versions, see hw/xfree86/common/xf86Module.h
 %define        xorg_xserver_server_ansic_abi           0.4
@@ -15,22 +15,23 @@
 %define        xorg_xserver_server_videodrv_abi        7.0
 %define        xorg_xserver_server_xinput_abi          9.0
 
-%define                rel             4
+%define                rel     1
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.8.0.901
+Version:       1.8.1.901
 Release:       %{rel}%{?with_multigl:.mgl}
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 5326bc5e84f2e3455321ab2baed26362
+# Source0-md5: fb5fa2229a4dee151f4525b2f5747c8c
 Source1:       10-quirks.conf                
 Source2:       xserver.pamd
 Patch0:                %{name}-xwrapper.patch
 Patch1:                %{name}-pic-libxf86config.patch
 Patch2:                %{name}-fb-size.patch
 Patch3:                %{name}-less-acpi-brokenness.patch
+Patch4:                %{name}-builtin-SHA1.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel >= 7.8.1
 # for glx headers
@@ -45,7 +46,6 @@ BuildRequires:        dbus-devel
 BuildRequires: libdrm-devel >= 2.4.5
 BuildRequires: libtool
 BuildRequires: ncurses-devel
-BuildRequires: openssl-devel
 BuildRequires: pam-devel
 BuildRequires: perl-base
 BuildRequires: pixman-devel >= 0.16.0
@@ -113,9 +113,9 @@ Requires:   xkeyboard-config
 # for rgb.txt
 Requires:      xorg-app-rgb >= 0.99.3
 Requires:      xorg-app-xkbcomp
-# xserver default config expects evdev+dbus+hald
 %{?with_hal:Suggests:  dbus}
-Suggests:      hal
+%{?with_hal:Suggests:  hal}
+%{?with_udev:Suggests: udev-core}
 Suggests:      udev-acl
 Suggests:      xorg-driver-input-evdev
 # xserver requires fixed and cursor fonts
@@ -331,6 +331,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -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