summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJengHyun Kang <jhyuni.kang@samsung.com>2016-08-30 19:02:04 +0900
committerJengHyun Kang <jhyuni.kang@samsung.com>2016-08-30 19:04:10 +0900
commit1bccb450e7a04c28e6b67a63d2bc41d3d2747bcf (patch)
treed48692586e0e4c8fdea610c893abb8c3de9b7292
parent92757f28fc9cf7fb90bdfc290b1b97e173c30a72 (diff)
downloadxkeyboard-config-1bccb450e7a04c28e6b67a63d2bc41d3d2747bcf.tar.gz
xkeyboard-config-1bccb450e7a04c28e6b67a63d2bc41d3d2747bcf.tar.bz2
xkeyboard-config-1bccb450e7a04c28e6b67a63d2bc41d3d2747bcf.zip
Change-Id: I9f4d8ecb7276513fdcd7f8c7d6c1dd3eed8b7e44
-rw-r--r--configure.ac7
-rw-r--r--keycodes/Makefile.am2
-rwxr-xr-xmake_keycodes.sh6
-rwxr-xr-xmake_symbols.sh6
-rw-r--r--packaging/xkeyboard-config.spec10
5 files changed, 11 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index 4c95ab9c..1689ff68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,11 +14,6 @@ AC_PROG_SED
AC_SUBST(VERSION)
-AC_ARG_WITH( tizen_profile,
- [AS_HELP_STRING([--with-tizen-profile=PROFILE],[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])
AM_CONDITIONAL(KEY_LAYOUT_EXIST, [test "x$key_layout_exist" = xyes])
@@ -84,8 +79,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hr hu id it ja ka ko ky lt nb nl pl pt_BR ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
-AC_SUBST(tizen_profile)
-AM_CONDITIONAL(TIZEN_COMMON_PROFILE, test "${tizen_profile}" = "common")
AC_SUBST(xkb_base)
AC_SUBST(xkb_rules_symlink)
diff --git a/keycodes/Makefile.am b/keycodes/Makefile.am
index c784d63a..18a035f6 100644
--- a/keycodes/Makefile.am
+++ b/keycodes/Makefile.am
@@ -20,7 +20,7 @@ xfree98 \
README
if KEY_LAYOUT_EXIST
-keycodes_DATA += tizen_${tizen_profile}
+keycodes_DATA += tizen
endif
EXTRA_DIST = $(keycodes_DATA)
diff --git a/make_keycodes.sh b/make_keycodes.sh
index e1ccafc2..176c3aa9 100755
--- a/make_keycodes.sh
+++ b/make_keycodes.sh
@@ -6,16 +6,16 @@ fi
KEYCODES_PATH="./keycodes/"
DEFAULT_KEYCODES_NAME="evdev"
-NEW_KEYCODES_NAME="tizen_"${TIZEN_PROFILE}
+NEW_KEYCODES_NAME="tizen"
FULL_KEY_LIST="\/\/ For Tizen Keycodes"
CHANGE_STRING="\/\/ @For Tizen Keycodes@"
PLATFORM_BASE_KEYCODE=8
if [ -e ${KEYMAP_FILE_PATH} ]
then
- echo "${TIZEN_PROFILE} have a key layout file: ${KEYMAP_FILE_PATH}"
+ echo "We have a key layout file: ${KEYMAP_FILE_PATH}"
else
- echo "${TIZEN_PROFILE} doesn't have a key layout file: ${KEYMAP_FILE_PATH}"
+ echo "We don't have a key layout file: ${KEYMAP_FILE_PATH}"
exit
fi
diff --git a/make_symbols.sh b/make_symbols.sh
index 85b734e5..67040023 100755
--- a/make_symbols.sh
+++ b/make_symbols.sh
@@ -7,16 +7,16 @@ fi
SYMBOLS_PATH="./symbols/inet"
DEFAULT_SYMBOLS_NAME="evdev"
DEFAULT_SYMBOLS_DEFINE="Evdev"
-NEW_SYMBOLS_NAME="tizen_"${TIZEN_PROFILE}
+NEW_SYMBOLS_NAME="tizen"
DEFAULT_SYMBOLS_SECTION=false
TEMP_SYMBOLS_FILE="./symbols/inet_tizen"
PLATFORM_BASE_KEYCODE=8
if [ -e ${KEYMAP_FILE_PATH} ]
then
- echo "${TIZEN_PROFILE} have a key layout file: ${KEYMAP_FILE_PATH}"
+ echo "We have a key layout file: ${KEYMAP_FILE_PATH}"
else
- echo "${TIZEN_PROFILE} doesn't have a key layout file: ${KEYMAP_FILE_PATH}"
+ echo "We don't have a key layout file: ${KEYMAP_FILE_PATH}"
exit
fi
diff --git a/packaging/xkeyboard-config.spec b/packaging/xkeyboard-config.spec
index 0a7e98e0..2f135147 100644
--- a/packaging/xkeyboard-config.spec
+++ b/packaging/xkeyboard-config.spec
@@ -42,7 +42,6 @@ make keyboards more accessible to people with physical impairments.
%prep
%setup -q
cp %{SOURCE1001} .
-export TIZEN_PROFILE="%{?profile}"
%if %{with x}
export TIZEN_WINDOW_SYSTEM="x11"
@@ -60,8 +59,7 @@ export KEYMAP_FILE_PATH="%{KEYMAP_FILE_PATH}"
--with-xkb-base=%{TZ_SYS_RO_SHARE}/X11/xkb \
--enable-compat_rules \
--disable-runtime-deps \
- --disable-xkbcomp-symlink \
- --with-tizen-profile="%{?profile}"
+ --disable-xkbcomp-symlink
rm -f */*.dir
%__make
@@ -75,10 +73,10 @@ ln -snf %{TZ_SYS_VAR}/lib/xkb/compiled/ %{buildroot}%{_datadir}/X11/xkb/compiled
%find_lang %{name}
%fdupes -s %{buildroot}%{_datadir}/X11/xkb
-cp -af %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/tizen_"%{?profile}"
+cp -af %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/tizen
mv -f %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev.org
-sed -i 's/evdev/tizen_%{?profile}/g' %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/tizen_"%{?profile}"
-ln -sf tizen_"%{?profile}" %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev
+sed -i 's/evdev/tizen/g' %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/tizen
+ln -sf tizen %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev
export LOCAL_KEYMAP_PATH=%{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb
export RULE_FILE_PATH=%{TZ_SYS_RO_SHARE}/X11/xkb/xkb.rule
export KEYMAP_FILE_PATH="%{KEYMAP_FILE_PATH}"