diff options
| author | Li,Limin <liminx.li@intel.com> | 2014-01-15 15:02:40 +0800 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-11-05 13:24:31 +0100 |
| commit | 2c74b008a7c7d6678dd6cc6ce869228c28f50c32 (patch) | |
| tree | 19ac6958a271ba0c7d5491c9b93556e88d3c9b74 | |
| parent | a6bef5492908c6c4f780436b194facbe0d26d679 (diff) | |
| download | xkeyboard-config-2c74b008a7c7d6678dd6cc6ce869228c28f50c32.tar.gz xkeyboard-config-2c74b008a7c7d6678dd6cc6ce869228c28f50c32.tar.bz2 xkeyboard-config-2c74b008a7c7d6678dd6cc6ce869228c28f50c32.zip | |
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 <liminx.li@intel.com>
Change-Id: Iddb487f7521779a7a927cda729e9e0b820dc5925
| -rw-r--r-- | packaging/xkeyboard-config.spec | 6 |
1 files changed, 5 insertions, 1 deletions
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 |