From 22f5c3faf28118c6908ae1e32242fe97b24bb79e53be57715b5706a018d94325 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 9 Jun 2009 15:53:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=128 --- xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 23 ++++++----------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index e8c8ab8..90a14b1 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 9 15:55:52 CEST 2009 - sndirsch@suse.de + +- diabled build of Xdmx since it conflict's with NOMAD's Xdmx + (bnc #511269) + ------------------------------------------------------------------- Fri Jun 5 23:42:25 CEST 2009 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index e56836f..f589828 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -32,7 +32,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 40 +Release: 41 License: GPL v2 or later; X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -133,7 +133,7 @@ This package contains the X.Org Server. License: GPL v2 or later; X11/MIT Summary: Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb) Group: System/X11/Servers/XF86_4 -Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xdmx +Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xvfb Obsoletes: xorg-x11-Xnest xorg-x11-Xvfb Requires: xorg-x11-fonts-core xorg-x11 Mesa AutoReqProv: on @@ -302,7 +302,7 @@ autoreconf -fi %else --enable-xorg \ %endif - --enable-dmx \ + --disable-dmx \ --enable-xnest \ --enable-kdrive \ --enable-xephyr \ @@ -513,20 +513,9 @@ exit 0 %ifnarch s390 s390x /usr/bin/cvt %endif -/usr/bin/dmxaddinput -/usr/bin/dmxaddscreen -/usr/bin/dmxreconfig -/usr/bin/dmxresize -/usr/bin/dmxrminput -/usr/bin/dmxrmscreen -/usr/bin/dmxtodmx -/usr/bin/dmxwininfo %ifnarch s390 s390x /usr/bin/gtf %endif -/usr/bin/vdltodmx -/usr/bin/xdmx -/usr/bin/xdmxconfig %ifnarch s390 s390x /usr/%{_lib}/X11/* /usr/%{_lib}/xorg/modules/ @@ -534,7 +523,6 @@ exit 0 %endif /usr/%{_lib}/xorg/protocol.txt %{_mandir}/man1/* -%exclude %{_mandir}/man1/Xdmx.1* %exclude %{_mandir}/man1/Xnest.1* %exclude %{_mandir}/man1/Xvfb.1* %ifnarch s390 s390x @@ -551,11 +539,9 @@ exit 0 %files extra %defattr(-,root,root) -/usr/bin/Xdmx /usr/bin/Xephyr /usr/bin/Xnest /usr/bin/Xvfb -%{_mandir}/man1/Xdmx.1* %{_mandir}/man1/Xnest.1* %{_mandir}/man1/Xvfb.1* @@ -576,6 +562,9 @@ exit 0 %endif %changelog +* Tue Jun 09 2009 sndirsch@suse.de +- diabled build of Xdmx since it conflict's with NOMAD's Xdmx + (bnc #511269) * Fri Jun 05 2009 sndirsch@suse.de - driver-autoconfig.diff * ati ==> fglrx --> radeonhd --> ati