From 2c74b008a7c7d6678dd6cc6ce869228c28f50c32 Mon Sep 17 00:00:00 2001 From: "Li,Limin" Date: Wed, 15 Jan 2014 15:02:40 +0800 Subject: init wayland support The display server based on X or Wayland, is now a choice of different profile in Tizen 3.0. Basically and consistently, two macros were used "with wayland" and "with x". Below summarize the combination of the macros: | wayland | x | meaning |--------------------------- | 0 | 1 | pure X11 platform(no wayland) | 1 | 0 | pure wayland platform (no X11) | 1 | 1 | wayland but X compatibility | 0 | 0 | no X and no wayland This method unifies the meaning and usage. Deploy this method to xkeyboard-config package. bug:https://bugs.tizen.org/jira/browse/PTREL-568 Signed-off-by: Li,Limin Change-Id: Iddb487f7521779a7a927cda729e9e0b820dc5925 --- packaging/xkeyboard-config.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packaging/xkeyboard-config.spec b/packaging/xkeyboard-config.spec index c4304223..f3846e80 100644 --- a/packaging/xkeyboard-config.spec +++ b/packaging/xkeyboard-config.spec @@ -1,3 +1,5 @@ +%bcond_with x + Name: xkeyboard-config Version: 2.7 Release: 0 @@ -11,9 +13,11 @@ BuildRequires: fdupes BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkg-config +%if %{with x} BuildRequires: xkbcomp -BuildRequires: pkgconfig(xorg-macros) >= 1.12 Requires: xkbcomp +%endif +BuildRequires: pkgconfig(xorg-macros) >= 1.12 Provides: XFree86:/etc/X11/xkb/symbols/us Provides: xorg-x11:/etc/X11/xkb/symbols/us BuildRoot: %{_tmppath}/%{name}-%{version}-build -- cgit v1.2.3