From 302a8316e40e313db78ba846a25596686714e8190d8c9a04d758c53475d7ebab Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 24 Mar 2010 16:06:52 +0000 Subject: [PATCH] - disabled udev support for openSUSE <= 11.2 (bnc #589997) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=233 --- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 177d694..126ad89 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 24 17:05:53 CET 2010 - sndirsch@suse.de + +- disabled udev support for openSUSE <= 11.2 (bnc #589997) + ------------------------------------------------------------------- Wed Mar 24 02:37:56 CET 2010 - ro@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1834871..5f98ede 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -25,8 +25,10 @@ Name: xorg-x11-server ### FIXME %define vnc 1 BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-fonts-devel -### udev support +### udev support (broken on openSUSE 11.2, see also bnc #589997) +%if %suse_version > 1120 BuildRequires: libudev-devel +%endif %if %vnc BuildRequires: libjpeg-devel %endif @@ -306,7 +308,9 @@ autoreconf -fi --disable-xprint \ --enable-record \ --enable-xcsecurity \ +%if %suse_version > 1120 --enable-config-udev \ +%endif --with-log-dir="/var/log" \ --with-os-name="openSUSE" \ --with-os-vendor="SUSE LINUX" \