1
0

Just being told, that OBS is ignoring 'recommended' packages. Therefore changed to Requires. :-( Other option would have been adjusting

at least the following packages to properly Buildrequire xorg-x11-server-Xvfb.

Also properly provides/obsoletes xorg-x11-Xvfb

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=746
This commit is contained in:
Stefan Dirsch 2019-09-23 10:26:30 +00:00 committed by Git OBS Bridge
parent 8904288e52
commit 9789aaef6f
2 changed files with 8 additions and 5 deletions

View File

@ -1,7 +1,7 @@
-------------------------------------------------------------------
Sat Sep 21 10:23:06 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- reintroduce Xvfb subpackage (boo#1151457)
- reintroduce Xvfb subpackage (boo#1151457)
-------------------------------------------------------------------
Mon Sep 16 15:00:32 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -164,9 +164,7 @@ Requires: Mesa
Requires(post): update-alternatives
Requires(postun): update-alternatives
%endif
Provides: xorg-x11-Xvfb
Provides: xorg-x11-server-glx
Obsoletes: xorg-x11-Xvfb
Obsoletes: xorg-x11-server-glx
Provides: glamor = %{version}
@ -203,8 +201,11 @@ Provides: X11_ABI_HAS_DPMS_GET_CAPABILITIES
Requires: xkeyboard-config
# install it by default; otherwise we run into too much package build failures
Recommends: xorg-x11-server-Xvfb
# Install it by default; otherwise we run into too much package build failures
# when Xvfb is being used for testing ...
# Unfortunately we need a requires here due to OBS not installing 'recommended'
# packages :-(
Requires: xorg-x11-server-Xvfb
# PATCH-FEATURE-OPENSUSE n_xorg-x11-server-rpmmacros.patch dimstar@opensuse.org -- Provide RPM macros to require correct ABI Versions.
Patch1: N_default-module-path.diff
@ -283,7 +284,9 @@ Requires: xkbcomp
# Xvfb requires keyboard files as well (bnc#797124)
Requires: xkeyboard-config
Recommends: xorg-x11-fonts-core
Provides: xorg-x11-Xvfb
Provides: xorg-x11-server:/usr/bin/Xvfb
Obsoletes: xorg-x11-Xvfb
%description Xvfb
This package contains the virtual Xserver Xvfb.