diff options
| author | Sung-Jin Park <sj76.park@samsung.com> | 2016-03-11 16:25:34 +0900 |
|---|---|---|
| committer | Sung-Jin Park <sj76.park@samsung.com> | 2016-03-11 16:28:27 +0900 |
| commit | b86c91bed526b8ae52257902b6c06964dd47359c (patch) | |
| tree | 6028ea96790cd133d3594c659aad3e34aed537ec | |
| parent | f7350be7369701b9a72293db4a8bb0dd55b25061 (diff) | |
| download | libxkbcommon-b86c91bed526b8ae52257902b6c06964dd47359c.tar.gz libxkbcommon-b86c91bed526b8ae52257902b6c06964dd47359c.tar.bz2 libxkbcommon-b86c91bed526b8ae52257902b6c06964dd47359c.zip | |
Apply directory macros and install license file to the proper directorysubmit/tizen/20160314.040949accepted/tizen/wearable/20160315.001531accepted/tizen/tv/20160315.001517accepted/tizen/mobile/20160315.001458accepted/tizen/ivi/20160315.001551accepted/tizen/common/20160315.220948
Change-Id: Icf6d15c1ad958177ee19e479e3368465261cee44
| -rwxr-xr-x | make_tizen_keymap.sh | 6 | ||||
| -rw-r--r-- | packaging/libxkbcommon.spec | 9 | ||||
| -rwxr-xr-x | test/data/sync.sh | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/make_tizen_keymap.sh b/make_tizen_keymap.sh index a61d148..1acb2fe 100755 --- a/make_tizen_keymap.sh +++ b/make_tizen_keymap.sh @@ -1,6 +1,10 @@ #!/bin/sh -KEYMAP_FILE_PATH="/usr/share/X11/xkb/tizen_key_layout.txt" +if [ "$TZ_SYS_RO_SHARE" = "" ]; then + TZ_SYS_RO_SHARE="/usr/share" +fi + +KEYMAP_FILE_PATH="${TZ_SYS_RO_SHARE}/X11/xkb/tizen_key_layout.txt" BASE_KEYSYM="0x10090000" TARGET_HEADER_FILE="./xkbcommon/tizen_keymap.h" TEMP_TEXT_FILE="./temp_file.txt" diff --git a/packaging/libxkbcommon.spec b/packaging/libxkbcommon.spec index 136f9cc..c8878b8 100644 --- a/packaging/libxkbcommon.spec +++ b/packaging/libxkbcommon.spec @@ -21,6 +21,8 @@ BuildRequires: python BuildRequires: xkb-tizen-data %endif +%global TZ_SYS_RO_SHARE %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share} + %description Keyboard handling library using XKB data. @@ -43,6 +45,7 @@ cp %{SOURCE1001} . %if "%{?profile}" == "common" %else export TIZEN_PROFILE="%{?profile}" +export TZ_SYS_RO_SHARE="%{TZ_SYS_RO_SHARE}" chmod a+x ./make_tizen_keymap.sh ./make_tizen_keymap.sh chmod a+x ./gen_tables.sh @@ -56,6 +59,10 @@ chmod a+x ./gen_tables.sh %install %make_install +#for license notification +mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license +cp -a %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name} + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -63,7 +70,7 @@ chmod a+x ./gen_tables.sh %files %manifest %{name}.manifest %defattr(-,root,root) -%license COPYING +%{TZ_SYS_RO_SHARE}/license/%{name} %{_libdir}/libxkbcommon.so.0* %files devel diff --git a/test/data/sync.sh b/test/data/sync.sh index 206231a..b8d05ad 100755 --- a/test/data/sync.sh +++ b/test/data/sync.sh @@ -1,6 +1,10 @@ #/bin/sh -XKBCONFIGROOT='/usr/share/X11/xkb' +if [ "$TZ_SYS_RO_SHARE" = "" ]; then + TZ_SYS_RO_SHARE="/usr/share" +fi + +XKBCONFIGROOT="${TZ_SYS_RO_SHARE}/X11/xkb" if [ ! -d test/data ]; then echo "Run this from the top source dir" |