From bb205fa42165f623a6489f46593efc0f01a0ea75cea18ef4cfcd4297cb6ea049 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 14 Jun 2012 14:09:52 +0000 Subject: [PATCH 1/2] - change xorg-x11 requires to a requires for xkbcomp (xorg-x11 is meanwhile a meta package, which requires any X sample app package); background: Xserver uses xkbcomp on startup for creating the cache file for xkb keyboard map. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=396 --- xorg-x11-server.changes | 8 ++++++++ xorg-x11-server.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 9fcd1f7..f2fd1b5 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 14 14:07:14 UTC 2012 - sndirsch@suse.com + +- change xorg-x11 requires to a requires for xkbcomp (xorg-x11 is + meanwhile a meta package, which requires any X sample app + package); background: Xserver uses xkbcomp on startup for + creating the cache file for xkb keyboard map. + ------------------------------------------------------------------- Fri Jun 8 14:12:48 UTC 2012 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 4d669d0..5292507 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -207,8 +207,8 @@ This package contains the X.Org Server. Summary: Additional Xservers (Xdmx, Xephyr, Xnest) Group: System/X11/Servers/XF86_4 Requires: Mesa +Requires: xkbcomp Requires: xkeyboard-config -Requires: xorg-x11 Requires: xorg-x11-fonts-core Provides: xorg-x11-Xnest Obsoletes: xorg-x11-Xnest From f159b104f3b124bd0288028acdee0b9df8620892aaead174f7a7b684f499420a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 14 Jun 2012 14:19:44 +0000 Subject: [PATCH 2/2] xorg-x11 --> xkbcomp requires changes was missing at several places OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=397 --- xorg-x11-server.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 5292507..bb981ff 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -105,7 +105,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %fillup_prereq %endif Requires: pkgconfig -Requires: xorg-x11 +Requires: xkbcomp Requires: xorg-x11-fonts-core %ifnarch s390 s390x Requires: libpixman-1-0 >= 0.24 @@ -252,8 +252,8 @@ This package contains the X.Org Server SDK. %package -n xorg-x11-Xvnc Summary: VNC Server for the X Window System Group: System/X11/Servers/XF86_4 +Requires: xkbcomp Requires: xkeyboard-config -Requires: xorg-x11 Requires: xorg-x11-fonts-core Provides: XFree86-Xvnc Provides: vnc:/usr/X11R6/bin/Xvnc