Use weekeyboard for Tizen IVI user session

Change-Id: I4cd7d958437482abf6b7ffdbef67dd087ea94bd5
Signed-off-by: Imran Zaman <imran.zaman@intel.com>

diff --git a/data/tizen-ivi/weston-user.ini b/data/tizen-ivi/weston-user.ini
index 7d73b010a5439f6a3807d09be1a44625c9291745..09ad156860008c5a3ad80354470e39283f4f9bc6 100644 (file)
--- a/data/tizen-ivi/weston-user.ini
+++ b/data/tizen-ivi/weston-user.ini
@@ -12,7 +12,10 @@ animation=zoom
 startup-animation=fade
 
 [input-method]
-path=/usr/libexec/weston-keyboard
+path=/bin/weekeyboard
+
+[keyboard]
+keymap_layout=wkb
 
 #[output]
 #name=LVDS1

diff --git a/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec
index fd7da22e0ff59bd90bf3c6d92efb05bc1e3feac0..4011e813da315fb630eb831ec0f5afe65e70f44a 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.spec
+++ b/dists/rpm/tizen/packaging/tlm.spec
@@ -81,7 +81,11 @@ Tizen Login Manager configuration files for common-profile.
 Summary:    Configuration files for ivi-profile with single seat
 Group:     System/Service
 Requires:   %{name} = %{version}-%{release}
+Requires:   weekeyboard
 Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-modello, %{name}-config-ivi-singleseat-ico
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-singleseat
 Generic Tizen Login Manager configuration files for ivi-profile with
@@ -93,9 +97,11 @@ Summary:    Configuration files for ivi-profile with single seat for modello
 Group:      System/Service
 Requires:   %{name} = %{version}-%{release}
 Requires:   Modello-Installer-xwalk
+Requires:   weekeyboard
 Provides:   %{name}-config
 Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-ico
 Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-singleseat-modello
 Generic Tizen Login Manager configuration files for ivi-profile with
@@ -120,9 +126,11 @@ single seat for ico.
 Summary:    Configuration files for ivi-profile with multi seat
 Group:     System/Service
 Requires:   %{name} = %{version}-%{release}
+Requires:   weekeyboard
 Provides:   %{name}-config
 Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
 Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-multiseat
 Generic Tizen Login Manager configuration files for ivi-profile with
@@ -132,10 +140,12 @@ multi seat.
 %package config-ivi-vtc1010
 Summary:    Configuration files for ivi-profile on VTC-1010
 Group:      System/Service
+Requires:   weekeyboard
 Requires:   %{name} = %{version}-%{release}
 Provides:   %{name}-config
 Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
 Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-multiseat
+Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-vtc1010
 Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index fd7da22e0ff59bd90bf3c6d92efb05bc1e3feac0..4011e813da315fb630eb831ec0f5afe65e70f44a 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -81,7 +81,11 @@ Tizen Login Manager configuration files for common-profile.
 Summary:    Configuration files for ivi-profile with single seat
 Group:     System/Service
 Requires:   %{name} = %{version}-%{release}
+Requires:   weekeyboard
 Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-modello, %{name}-config-ivi-singleseat-ico
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-singleseat
 Generic Tizen Login Manager configuration files for ivi-profile with
@@ -93,9 +97,11 @@ Summary:    Configuration files for ivi-profile with single seat for modello
 Group:      System/Service
 Requires:   %{name} = %{version}-%{release}
 Requires:   Modello-Installer-xwalk
+Requires:   weekeyboard
 Provides:   %{name}-config
 Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-ico
 Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-singleseat-modello
 Generic Tizen Login Manager configuration files for ivi-profile with
@@ -120,9 +126,11 @@ single seat for ico.
 Summary:    Configuration files for ivi-profile with multi seat
 Group:     System/Service
 Requires:   %{name} = %{version}-%{release}
+Requires:   weekeyboard
 Provides:   %{name}-config
 Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
 Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-multiseat
 Generic Tizen Login Manager configuration files for ivi-profile with
@@ -132,10 +140,12 @@ multi seat.
 %package config-ivi-vtc1010
 Summary:    Configuration files for ivi-profile on VTC-1010
 Group:      System/Service
+Requires:   weekeyboard
 Requires:   %{name} = %{version}-%{release}
 Provides:   %{name}-config
 Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
 Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-multiseat
+Conflicts:  ico-uxf-weston-plugin
 
 %description config-ivi-vtc1010
 Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.