Peter M. Groen / dali-demo

Commit 81d802ad06e11478cebe769d7640ad53a7559302

Authored by Paul Wisbey
1 parent 1e8cf4e9

First attempt at rpm installation of .mo files 

Change-Id: I1722f103987dfb592a39378e4cb5eefab4ebf5e8
Inline Side-by-side
Showing 2 changed files with 7 additions and 2 deletions
build/tizen/CMakeLists.txt
  View file @81d802a
@@ -23,7 +23,10 @@ SET(LOCAL_SCRIPTS_DIR ${ROOT_SRC_DIR}/demo/scripts) @@ -23,7 +23,10 @@ SET(LOCAL_SCRIPTS_DIR ${ROOT_SRC_DIR}/demo/scripts)
23 SET(IMAGES_DIR ${APP_DATA_DIR}/images/) 23 SET(IMAGES_DIR ${APP_DATA_DIR}/images/)
24 SET(MODELS_DIR ${APP_DATA_DIR}/models/) 24 SET(MODELS_DIR ${APP_DATA_DIR}/models/)
25 SET(SCRIPTS_DIR ${APP_DATA_DIR}/scripts/) 25 SET(SCRIPTS_DIR ${APP_DATA_DIR}/scripts/)
26 -SET(LOCALE_DIR ${PREFIX}/share/locale) 26 +
  27 +IF(NOT DEFINED LOCALE_DIR)
  28 + SET(LOCALE_DIR ${PREFIX}/share/locale)
  29 +ENDIF()
27 30
28 SET(DALI_IMAGE_DIR \\"${IMAGES_DIR}\\") 31 SET(DALI_IMAGE_DIR \\"${IMAGES_DIR}\\")
29 SET(DALI_MODEL_DIR \\"${MODELS_DIR}\\") 32 SET(DALI_MODEL_DIR \\"${MODELS_DIR}\\")
packaging/com.samsung.dali-demo.spec
  View file @81d802a
@@ -39,6 +39,7 @@ of the capability of the toolkit. @@ -39,6 +39,7 @@ of the capability of the toolkit.
39 %define dali_xml_file_dir /usr/share/packages/ 39 %define dali_xml_file_dir /usr/share/packages/
40 %define dali_icon_dir /usr/share/icons/ 40 %define dali_icon_dir /usr/share/icons/
41 %define smack_rule_dir /etc/smack/accesses2.d/ 41 %define smack_rule_dir /etc/smack/accesses2.d/
  42 +%define locale_dir %{dali_app_ro_dir}/res/locale
42 43
43 ############################## 44 ##############################
44 # Build 45 # Build
@@ -52,7 +53,7 @@ LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -fPIC" @@ -52,7 +53,7 @@ LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -fPIC"
52 CXXFLAGS+=" -D_ARCH_ARM_" 53 CXXFLAGS+=" -D_ARCH_ARM_"
53 %endif 54 %endif
54 55
55 -cd %{_builddir}/%{name}-%{version}/build/tizen && cmake -DDALI_APP_DIR=%{dali_app_ro_dir} . 56 +cd %{_builddir}/%{name}-%{version}/build/tizen && cmake -DDALI_APP_DIR=%{dali_app_ro_dir} -DLOCALE_DIR=%{locale_dir} .
56 57
57 make %{?jobs:-j%jobs} 58 make %{?jobs:-j%jobs}
58 59
@@ -112,6 +113,7 @@ exit 0 @@ -112,6 +113,7 @@ exit 0
112 %{dali_app_ro_dir}/scripts/* 113 %{dali_app_ro_dir}/scripts/*
113 %{dali_xml_file_dir}/%{name}.xml 114 %{dali_xml_file_dir}/%{name}.xml
114 %{dali_icon_dir}/* 115 %{dali_icon_dir}/*
  116 +%{locale_dir}/*
115 %if 0%{?enable_dali_smack_rules} && !%{with wayland} 117 %if 0%{?enable_dali_smack_rules} && !%{with wayland}
116 %config %{smack_rule_dir}/%{name}.rule 118 %config %{smack_rule_dir}/%{name}.rule
117 %endif 119 %endif