Install tizen keymap files in the xkb-data package

8 files changed, 198 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index b71b2a10..1a936790 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_ARG_WITH( tizen_profile,
              tizen_profile="$withval",
              tizen_profile="common" )
 
-AC_CHECK_FILE(/usr/share/X11/xkb/tizen_key_layout.txt, [key_layout_exist=yes], [key_layout_exist=no])
+AC_CHECK_FILE(tizen_key_layout.txt, [key_layout_exist=yes], [key_layout_exist=no])
 AM_CONDITIONAL(KEY_LAYOUT_EXIST, [test "x$key_layout_exist" = xyes])
 
 AC_ARG_WITH( xkb_base,
diff --git a/keylayout/tizen_key_layout_mobile.txt b/keylayout/tizen_key_layout_mobile.txt
new file mode 100644
index 00000000..62f13678
--- /dev/null
+++ b/keylayout/tizen_key_layout_mobile.txt
@@ -0,0 +1,41 @@
+XF86AudioRaiseVolume 115
+XF86AudioLowerVolume 114
+XF86PowerOff 116
+XF86Menu 169
+XF86Home 139
+XF86Back 158
+XF86Camera 171
+XF86Camera_Full 212
+XF86Search 217
+XF86AudioPlay 200
+XF86AudioPlay 207 keyboard
+XF86AudioPause 201
+XF86AudioStop 166
+XF86AudioStop 128 keyboard
+XF86AudioNext 163
+XF86AudioPrev 165
+XF86AudioRewind 168
+XF86AudioForward 208
+XF86AudioMedia 226
+XF86AudioPlayPause 164
+XF86AudioMute 113
+XF86AudioRecord 167
+Cancel 223 keyboard
+XF86SoftKBD 148
+XF86QuickPanel 183
+XF86TaskPane 184
+XF86TaskPane 154 keyboard
+XF86HomePage 172
+XF86WWW 150
+XF86Mail 155
+XF86Mail 215 keyboard
+XF86ScreenSaver 152
+XF86MonBrightnessDown 224
+XF86MonBrightnessUp 225
+XF86Voice 149
+Hangul 122 keyboard
+XF86Apps 204
+XF86Call 218
+XF86Game 220
+XF86VoiceWakeUp_LPSD 202
+XF86VoiceWakeUp 203
diff --git a/keylayout/tizen_key_layout_tv.txt b/keylayout/tizen_key_layout_tv.txt
new file mode 100644
index 00000000..55af975f
--- /dev/null
+++ b/keylayout/tizen_key_layout_tv.txt
@@ -0,0 +1,91 @@
+XF86AudioRaiseVolume 115
+XF86AudioLowerVolume 114
+XF86PowerOff 116
+XF86Menu 139
+XF86Home 169
+XF86Back 158
+XF86Camera_Full 212
+XF86Search 217
+XF86AudioPlay 200
+XF86AudioPlay 207 keyboard
+XF86AudioPause 201
+XF86AudioStop 166
+XF86AudioStop 128 keyboard
+XF86AudioNext 163
+XF86AudioPrev 165
+XF86AudioRewind 168
+XF86AudioForward 208
+XF86AudioMedia 226
+XF86AudioPlayPause 164
+XF86AudioMute 113
+XF86AudioRecord 167
+Cancel 223 keyboard
+XF86SoftKBD 148
+XF86QuickPanel 183
+XF86TaskPane 184
+XF86TaskPane 154 keyboard
+XF86HomePage 172
+XF86WWW 150
+XF86Mail 155
+XF86Mail 215 keyboard
+XF86ScreenSaver 152
+XF86MonBrightnessDown 224
+XF86MonBrightnessUp 225
+XF86Voice 149
+Hangul 122 keyboard
+XF86Apps 204
+XF86Call 218
+XF86Game 220
+XF86VoiceWakeUp_LPSD 202
+XF86VoiceWakeUp 203
+XF86TV 189
+XF86Display 227
+XF86RCConfig 192
+XF86RCMode 185
+XF86SoftRC 140
+1 2 keyboard
+2 3 keyboard
+3 4 keyboard
+4 5 keyboard
+5 6 keyboard
+6 7 keyboard
+7 8 keyboard
+8 9 keyboard
+9 10 keyboard
+0 11 keyboard
+minus 12 keyboard
+XF86LowerChannel 109
+XF86RaiseChannel 104
+XF86ChannelList 60
+XF86PreviousChannel 412
+XF86SysMenu 438
+XF86SimpleMenu 191
+XF86History 156
+XF86Favorites 190
+Up 103 keyboard
+Down 108 keyboard
+Left 105 keyboard
+Right 106 keyboard
+Return 28 keyboard
+XF86Close 174
+XF86Close 206 keyboard
+XF86Info 61
+XF86Red 62
+XF86Green 63
+XF86Yellow 64
+XF86Blue 65
+XF86ProgInfo 67
+XF86PictureMode 68
+XF86PictureSize 88
+XF86PIP 66
+XF86Guide 130
+XF86AudioMode 187
+XF86Subtitle 186
+XF863D 188
+Return 352
+XF86Home 354
+XF86TV 377
+XF86RaiseChannel 402
+XF86LowerChannel 403
+XF86AudioPrev 405
+XF86AudioNext 407
diff --git a/keylayout/tizen_key_layout_wearable.txt b/keylayout/tizen_key_layout_wearable.txt
new file mode 100644
index 00000000..bb43e5a7
--- /dev/null
+++ b/keylayout/tizen_key_layout_wearable.txt
@@ -0,0 +1,33 @@
+XF86AudioRaiseVolume 115
+XF86AudioLowerVolume 114
+XF86PowerOff 116
+XF86Menu 169
+XF86Home 139
+XF86Back 158
+XF86Camera_Full 212
+XF86Search 217
+XF86AudioPlay 200
+XF86AudioPlay 207 keyboard
+XF86AudioPause 201
+XF86AudioStop 166
+XF86AudioStop 128 keyboard
+XF86AudioNext 163
+XF86AudioPrev 165
+XF86AudioRewind 168
+XF86AudioForward 208
+XF86AudioMedia 226
+XF86AudioPlayPause 164
+XF86AudioMute 113
+XF86AudioRecord 167
+Cancel 223 keyboard
+XF86SoftKBD 148
+XF86TaskPane 184
+XF86TaskPane 154 keyboard
+XF86ScreenSaver 152
+XF86MonBrightnessDown 224
+XF86MonBrightnessUp 225
+XF86Voice 149
+XF86Apps 204
+XF86Call 218
+XF86VoiceWakeUp_LPSD 202
+XF86VoiceWakeUp 203
diff --git a/make_keycodes.sh b/make_keycodes.sh
index 55a24c8c..ab49b50a 100755
--- a/make_keycodes.sh
+++ b/make_keycodes.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-KEYMAP_FILE_PATH="/usr/share/X11/xkb/tizen_key_layout.txt"
+KEYMAP_FILE_PATH="tizen_key_layout.txt"
 KEYCODES_PATH="./keycodes/"
 DEFAULT_KEYCODES_NAME="evdev"
 NEW_KEYCODES_NAME="tizen_"${TIZEN_PROFILE}
diff --git a/make_symbols.sh b/make_symbols.sh
index 73caf722..3b308a9d 100755
--- a/make_symbols.sh
+++ b/make_symbols.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-KEYMAP_FILE_PATH="/usr/share/X11/xkb/tizen_key_layout.txt"
+KEYMAP_FILE_PATH="tizen_key_layout.txt"
 SYMBOLS_PATH="./symbols/inet"
 DEFAULT_SYMBOLS_NAME="evdev"
 DEFAULT_SYMBOLS_DEFINE="Evdev"
diff --git a/packaging/xkb-data.manifest b/packaging/xkb-data.manifest
new file mode 100644
index 00000000..017d22d3
--- /dev/null
+++ b/packaging/xkb-data.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/xkeyboard-config.spec b/packaging/xkeyboard-config.spec
index aad6123d..fd4561df 100644
--- a/packaging/xkeyboard-config.spec
+++ b/packaging/xkeyboard-config.spec
@@ -24,10 +24,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Requires(pre):  /usr/bin/ln
 Requires(pre):  /usr/bin/rm
-%if "%{?profile}" == "common"
-%else
-BuildRequires:  e-tizen-data
-%endif
 
 %description
 The X Keyboard Extension essentially replaces the core protocol
@@ -37,19 +33,31 @@ and to more closely track the logical and physical state of the
 keyboard. It also includes a number of keyboard controls designed to
 make keyboards more accessible to people with physical impairments.
 
+
+%if "%{?profile}" == "common"
+%else
+%package -n xkb-data
+Summary:    Xkb configuration data
+Group:      System/Utilities
+
+%description -n xkb-data
+%{summary}
+%endif
+
 %prep
 %setup -q
 cp %{SOURCE1001} .
 export TIZEN_PROFILE="%{?profile}"
 %if "%{?profile}" == "common"
 %else
-
 %if %{with x}
 export TIZEN_WINDOW_SYSTEM="x11"
 %else
 export TIZEN_WINDOW_SYSTEM="wayland"
 %endif
 
+cp keylayout/tizen_key_layout_"%{?profile}".txt tizen_key_layout.txt
+
 ./make_keycodes.sh
 ./make_symbols.sh
 %endif
@@ -79,6 +87,9 @@ cp -af %{buildroot}/usr/share/X11/xkb/rules/evdev %{buildroot}/usr/share/X11/xkb
 mv -f %{buildroot}/usr/share/X11/xkb/rules/evdev %{buildroot}/usr/share/X11/xkb/rules/evdev.org
 sed -i 's/evdev/tizen_%{?profile}/g' %{buildroot}/usr/share/X11/xkb/rules/tizen_"%{?profile}"
 ln -sf tizen_"%{?profile}" %{buildroot}/usr/share/X11/xkb/rules/evdev
+
+%__mkdir_p %{buildroot}/usr/share/X11/xkb
+%__cp -f tizen_key_layout.txt %{buildroot}/usr/share/X11/xkb/tizen_key_layout.txt
 %endif
 
 %files -f %{name}.lang
@@ -89,3 +100,12 @@ ln -sf tizen_"%{?profile}" %{buildroot}/usr/share/X11/xkb/rules/evdev
 %dir %{_localstatedir}/lib/xkb/compiled
 %{_datadir}/X11/xkb/
 %{_datadir}/pkgconfig/*.pc
+%if "%{?profile}" == "common"
+%else
+
+%files -n xkb-data
+%manifest %{name}.manifest
+%license COPYING
+%{_datadir}/X11/xkb/tizen_key_layout.txt
+
+%endif