remove unnecessary keymap files except symbols before build a package

Change-Id: I29a6e7ef3d099f6c6525f92eaab2b53f504c39f7

diff --git a/packaging/xkeyboard-config.spec b/packaging/xkeyboard-config.spec
index d445f9bd5abc7b04711f72ff00f1250b4c3cad8f..594d1678acaec2d288a3557cbb9b1f005db74268 100644 (file)
--- a/packaging/xkeyboard-config.spec
+++ b/packaging/xkeyboard-config.spec
@@ -80,10 +80,10 @@ 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}"
+./remove_unused_files.sh
 
 install -m 0700 make_symbols.sh %{buildroot}%{_bindir}/
 install -m 0700 make_keycodes.sh %{buildroot}%{_bindir}/
-install -m 0700 remove_unused_files.sh %{buildroot}%{_bindir}/
 install -m 0700 remove_symbols.sh %{buildroot}%{_bindir}/
 
 # DO the optimization at RPM install, not at build
@@ -101,13 +101,13 @@ export KEYMAP_FILE_PATH=%{KEYMAP_FILE_PATH}
 pushd %{TZ_SYS_RO_SHARE}/X11/xkb
 %{_bindir}/make_keycodes.sh
 %{_bindir}/make_symbols.sh
+%{_bindir}/remove_symbols.sh
 rm -f %{_bindir}/make_keycodes.sh
 rm -f %{_bindir}/make_symbols.sh
+rm -f %{_bindir}/remove_symbols.sh
 popd
 pushd /tmp/xkeyboard-config-install
 ln -sf %{_bindir}/remove_symbols.sh remove_symbols.sh
-%{_bindir}/remove_unused_files.sh
-rm -f %{_bindir}/remove_unused_files.sh
 rm -f %{_bindir}/remove_symbols.sh
 rm remove_symbols.sh
 %{_bindir}/cache
@@ -128,5 +128,4 @@ popd
 %{_bindir}/cache
 %{_bindir}/make_keycodes.sh
 %{_bindir}/make_symbols.sh
-%{_bindir}/remove_unused_files.sh
 %{_bindir}/remove_symbols.sh

diff --git a/remove_unused_files.sh b/remove_unused_files.sh
index d0ab20e3e3085c2c345b2bb843acbbf8a209a1d1..a6ed68547a2c0776da9d22fc2bf81f802035cd94 100755 (executable)
--- a/remove_unused_files.sh
+++ b/remove_unused_files.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 KEYMAP_PATH=${LOCAL_KEYMAP_PATH}
+
 rm -rf ${KEYMAP_PATH}/compat/japan
 rm -rf ${KEYMAP_PATH}/compat/olpc
 rm -rf ${KEYMAP_PATH}/compat/pc*
@@ -12,7 +13,6 @@ rm -rf ${KEYMAP_PATH}/keycodes/amiga
 rm -rf ${KEYMAP_PATH}/keycodes/ataritt
 rm -rf ${KEYMAP_PATH}/keycodes/digital_vndr
 rm -rf ${KEYMAP_PATH}/keycodes/empty
-rm -rf ${KEYMAP_PATH}/keycodes/evdev
 rm -rf ${KEYMAP_PATH}/keycodes/fujitsu
 rm -rf ${KEYMAP_PATH}/keycodes/hp
 rm -rf ${KEYMAP_PATH}/keycodes/ibm
@@ -27,13 +27,10 @@ rm -rf ${KEYMAP_PATH}/rules/HDR
 rm -rf ${KEYMAP_PATH}/rules/base*
 rm -rf ${KEYMAP_PATH}/rules/bin
 rm -rf ${KEYMAP_PATH}/rules/compat
-rm -rf ${KEYMAP_PATH}/rules/evdev.*
 rm -rf ${KEYMAP_PATH}/rules/xfree*
 rm -rf ${KEYMAP_PATH}/rules/xkb.dtd
 rm -rf ${KEYMAP_PATH}/rules/xorg*
 
-./remove_symbols.sh
-
 rm -rf ${KEYMAP_PATH}/types/cancel
 rm -rf ${KEYMAP_PATH}/types/caps
 rm -rf ${KEYMAP_PATH}/types/default