From e58d85adfd5bd3a1ec58fb9e19ce1bd24e77e683d263d9552b59482cf555c624 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 30 Apr 2009 22:51:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=123 --- xorg-x11-server.changes | 14 ++++++++++++++ xorg-x11-server.spec | 24 +++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index bbf8564..1f41713 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Apr 30 15:04:14 CEST 2009 - sndirsch@suse.de + +- instead of require do provide + INPUT_ABI_VERSION/VIDEO_ABI_VERSION to fix dependancy loop + +------------------------------------------------------------------- +Thu Apr 30 12:21:40 CEST 2009 - sndirsch@suse.de + +- xkeyboard-config should be required by xorg-x11-driver-input +- require INPUT_ABI_VERSION = 4 (provided by xorg-x11-driver-input) +- require VIDEO_ABI_VERSION = 5 (provided by xorg-x11-driver-video) +- require libpixman-1-0 >= 0.15.2 + ------------------------------------------------------------------- Tue Apr 28 19:36:33 CEST 2009 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index c7e79ea..9625445 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -32,17 +32,19 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 35 -License: X11/MIT +Release: 36 +License: GPL v2 or later; X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 %ifnarch s390 s390x PreReq: %fillup_prereq %endif -Requires: pkgconfig xorg-x11-fonts-core xorg-x11 xkeyboard-config +Requires: pkgconfig xorg-x11-fonts-core xorg-x11 %if %suse_version > 1010 %ifnarch s390 s390x -Requires: xorg-x11-driver-input xorg-x11-driver-video +Provides: VIDEO_ABI_VERSION = 5 +Provides: INPUT_ABI_VERSION = 4 +Requires: libpixman-1-0 >= 0.15.2 %endif %endif Provides: xorg-x11-server-glx @@ -116,7 +118,7 @@ This package contains the X.Org Server. %package extra -License: X11/MIT +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 @@ -130,7 +132,7 @@ This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb). %package sdk -License: X11/MIT +License: GPL v2 or later; X11/MIT Summary: X.Org Server SDK. Group: System/Libraries Provides: xorg-x11-sdk @@ -146,7 +148,7 @@ This package contains the X.Org Server SDK. %if %vnc %package -n xorg-x11-Xvnc -License: GPL v2 or later +License: GPL v2 or later; X11/MIT Summary: VNC Server for the X Window System Group: System/X11/Servers/XF86_4 Requires: xorg-x11-fonts-core xorg-x11 @@ -550,6 +552,14 @@ exit 0 %endif %changelog +* Thu Apr 30 2009 sndirsch@suse.de +- instead of require do provide + INPUT_ABI_VERSION/VIDEO_ABI_VERSION to fix dependancy loop +* Thu Apr 30 2009 sndirsch@suse.de +- xkeyboard-config should be required by xorg-x11-driver-input +- require INPUT_ABI_VERSION = 4 (provided by xorg-x11-driver-input) +- require VIDEO_ABI_VERSION = 5 (provided by xorg-x11-driver-video) +- require libpixman-1-0 >= 0.15.2 * Tue Apr 28 2009 sndirsch@suse.de - enable DRI2 build * Tue Apr 14 2009 sndirsch@suse.de