1
0
OBS User unknown 2009-04-30 22:51:47 +00:00 committed by Git OBS Bridge
parent b2a6cd7333
commit e58d85adfd
2 changed files with 31 additions and 7 deletions

View File

@ -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

View File

@ -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