From 81d802ad06e11478cebe769d7640ad53a7559302 Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Wed, 25 Feb 2015 16:06:38 +0000 Subject: [PATCH] First attempt at rpm installation of .mo files --- build/tizen/CMakeLists.txt | 5 ++++- packaging/com.samsung.dali-demo.spec | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 7f92f55..79b2b4f 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -23,7 +23,10 @@ SET(LOCAL_SCRIPTS_DIR ${ROOT_SRC_DIR}/demo/scripts) SET(IMAGES_DIR ${APP_DATA_DIR}/images/) SET(MODELS_DIR ${APP_DATA_DIR}/models/) SET(SCRIPTS_DIR ${APP_DATA_DIR}/scripts/) -SET(LOCALE_DIR ${PREFIX}/share/locale) + +IF(NOT DEFINED LOCALE_DIR) + SET(LOCALE_DIR ${PREFIX}/share/locale) +ENDIF() SET(DALI_IMAGE_DIR \\"${IMAGES_DIR}\\") SET(DALI_MODEL_DIR \\"${MODELS_DIR}\\") diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 6f08cb9..73868a4 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -39,6 +39,7 @@ of the capability of the toolkit. %define dali_xml_file_dir /usr/share/packages/ %define dali_icon_dir /usr/share/icons/ %define smack_rule_dir /etc/smack/accesses2.d/ +%define locale_dir %{dali_app_ro_dir}/res/locale ############################## # Build @@ -52,7 +53,7 @@ LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -fPIC" CXXFLAGS+=" -D_ARCH_ARM_" %endif -cd %{_builddir}/%{name}-%{version}/build/tizen && cmake -DDALI_APP_DIR=%{dali_app_ro_dir} . +cd %{_builddir}/%{name}-%{version}/build/tizen && cmake -DDALI_APP_DIR=%{dali_app_ro_dir} -DLOCALE_DIR=%{locale_dir} . make %{?jobs:-j%jobs} @@ -112,6 +113,7 @@ exit 0 %{dali_app_ro_dir}/scripts/* %{dali_xml_file_dir}/%{name}.xml %{dali_icon_dir}/* +%{locale_dir}/* %if 0%{?enable_dali_smack_rules} && !%{with wayland} %config %{smack_rule_dir}/%{name}.rule %endif -- libgit2 0.21.4