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 2961fedfd603873b6a07f93a464b8bd2eec9e4d4..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,23 +15,25 @@
 %define        xorg_xserver_server_videodrv_abi        7.0
 %define        xorg_xserver_server_xinput_abi          9.0
 
-%define                rel             3
+%define                rel     1
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.8.0
+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: 7cec3a11890bb53f4a07854319360348
+# 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
+BuildRequires: Mesa-libGL-devel >= 7.8.1
 # for glx headers
 BuildRequires: OpenGL-GLX-devel
 BuildRequires: autoconf >= 2.57
@@ -44,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
@@ -112,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
@@ -330,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
@@ -404,14 +406,14 @@ rm -rf $RPM_BUILD_ROOT
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
 install -d $RPM_BUILD_ROOT/etc/{security/console.apps,X11/xorg.conf.d}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input}
+install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+
 :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
 :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
 
-%if %{with udev}
-mv $RPM_BUILD_ROOT%{_prefix}/etc/X11/xorg.conf.d/10-evdev.conf $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
-%endif
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/10-quirks.conf
 
 %if %{with multigl}
 cd $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
@@ -470,9 +472,9 @@ fi
 %config(missingok) /etc/security/console.apps/xserver
 %{?with_dbus:/etc/dbus-1/system.d/xorg-server.conf}
 %dir /etc/X11/xorg.conf.d
-%if %{with udev}
-%config(noreplace) %verify(not md5 mtime size) /etc/X11/xorg.conf.d/10-evdev.conf
-%endif
+%dir %{_datadir}/X11/xorg.conf.d
+# overwrite these settings with local configs in /etc/X11/xorg.conf.d
+%verify(not md5 mtime size) %{_datadir}/X11/xorg.conf.d/*.conf
 %{_mandir}/man1/Xorg.1x*
 %{_mandir}/man1/Xserver.1x*
 %{_mandir}/man1/cvt.1*