From b3efad5d86049034d28ef1b0aa3142ec919edf76fc027cacb615eeda661a206f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Jan 2013 11:48:17 +0000 Subject: [PATCH] - let xorg-x11-server require xkeyboard-config again, since Xvfb is part of this package and requires keyboard files as well (bnc#797124) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=425 --- xorg-x11-server.changes | 7 +++++++ xorg-x11-server.spec | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index f1ea197..b6c96b3 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 8 11:46:23 UTC 2013 - sndirsch@suse.com + +- let xorg-x11-server require xkeyboard-config again, since Xvfb + is part of this package and requires keyboard files as well + (bnc#797124) + ------------------------------------------------------------------- Fri Dec 14 10:39:08 UTC 2012 - tobias.johannes.klausmann@mni.thm.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index d2619f0..39a4279 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-server # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -113,6 +113,8 @@ Provides: xorg-x11-Xvfb Provides: xorg-x11-server-glx Obsoletes: xorg-x11-Xvfb Obsoletes: xorg-x11-server-glx +# Xvfb requires keyboard files as well (bnc#797124) +Requires: xkeyboard-config %if %vnc # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch17: n_VNC-Add-support-for-VNC.patch