From 8904288e52f714552b42e8caa2437808e807693c2326d55a843b34910214bbf5 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 21 Sep 2019 16:03:09 +0000
Subject: [PATCH] - reintroduce Xvfb subpackage (boo#1151457)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=745
---
 xorg-x11-server.changes |  5 +++++
 xorg-x11-server.spec    | 22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index eca32a2..b194d46 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Sep 21 10:23:06 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- reintroduce Xvfb subpackage (boo#1151457) 
+
 -------------------------------------------------------------------
 Mon Sep 16 15:00:32 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 39239de..6653771 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -201,9 +201,11 @@ Obsoletes:      xorg-x11-driver-video < 7.6_1
  # Remove (also from depending driver(s)) when updating X11_ABI_VIDEODRV by updating the server package - NOTE: also remove from xorg-x11-server.macros.in !
 Provides:       X11_ABI_HAS_DPMS_GET_CAPABILITIES
 
-# Xvfb requires keyboard files as well (bnc#797124)
 Requires:       xkeyboard-config
 
+# install it by default; otherwise we run into too much package build failures
+Recommends:     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
 Patch2:         N_zap_warning_xserver.diff
@@ -273,6 +275,19 @@ Obsoletes:      xorg-x11-Xnest
 %description extra
 This package contains additional Xservers (Xdmx, Xephyr, Xnest).
 
+%package Xvfb
+Summary:        Virtual Xserver Xvfb
+Group:          System/X11/Servers/XF86_4
+Requires:       Mesa
+Requires:       xkbcomp
+# Xvfb requires keyboard files as well (bnc#797124)
+Requires:       xkeyboard-config
+Recommends:     xorg-x11-fonts-core
+Provides:       xorg-x11-server:/usr/bin/Xvfb
+
+%description Xvfb
+This package contains the virtual Xserver Xvfb.
+
 %if 0%{?have_wayland} == 1
 %package wayland
 Summary:        Xwayland Xserver
@@ -635,7 +650,6 @@ fi
 %ghost %{_sysconfdir}/alternatives/libglx.so
 %endif
 %endif
-%{_bindir}/Xvfb
 %{_bindir}/xorg-backtrace
 
 %if 0%{?have_wayland} == 1
@@ -669,6 +683,10 @@ fi
 %{_mandir}/man1/Xephyr.1*
 %{_mandir}/man1/Xnest.1*
 
+%files Xvfb
+%defattr(-,root,root)
+%{_bindir}/Xvfb
+
 %files sdk
 %defattr(-,root,root)
 %{_includedir}/xorg/