TizenRefApp-5009 Update install paths for wallpaper-ui-service

Change-Id: If26d442eb4e4dd2a27b9cd2aac2c45907d6d9e6d
Signed-off-by: Andriy Kotsyuba <a.kotsyuba@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d4733b..2d2a0ba 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ pkg_check_modules(pkgs REQUIRED
        wallpaper-service
        core-samsung-log-client
        edbus
+       libtzplatform-config
 )
 ELSE()
 INCLUDE(FindPkgConfig)
@@ -69,6 +70,7 @@ pkg_check_modules(pkgs REQUIRED
        notification
        capi-content-media-content
        edbus
+       libtzplatform-config
 )
 ENDIF()
 

diff --git a/include/wallpaper-ui-service-main.h b/include/wallpaper-ui-service-main.h
index e937657..a300dde 100755 (executable)
--- a/include/wallpaper-ui-service-main.h
+++ b/include/wallpaper-ui-service-main.h
@@ -29,6 +29,7 @@
 #include <Elementary.h>
 #include <Eina.h>
 #include <Evas.h>
+#include <tzplatform_config.h>
 
 #include "wallpaper-ui-service-debug.h"
 
@@ -54,7 +55,7 @@ typedef struct {
 #endif
 
 #ifndef WALLPAPER_TXT_FILE
-#define WALLPAPER_TXT_FILE "/opt/usr/share/lockscreen/wallpaper_list/lockscreen_selected_images.txt"
+#define WALLPAPER_TXT_FILE tzplatform_mkpath(TZ_USER_SHARE, "lockscreen/wallpaper_list/lockscreen_selected_images.txt")
 #endif
 
 

diff --git a/include/wallpaper-ui-service.h b/include/wallpaper-ui-service.h
index 21c7982..86d5fa6 100755 (executable)
--- a/include/wallpaper-ui-service.h
+++ b/include/wallpaper-ui-service.h
@@ -27,6 +27,7 @@
 #include <Evas.h>
 #include "wallpaper-ui-service-debug.h"
 #include <E_DBus.h>
+#include <tzplatform_config.h>
 
 #define PKGNAME "wallpaper-ui-service"
 
@@ -51,11 +52,11 @@
 #endif
 
 #if !defined(EDJDIR)
-#define EDJDIR "/usr/apps/org.tizen.wallpaper-ui-service/res/edje"
+#define EDJDIR tzplatform_mkpath(TZ_SYS_RO_APP, PKGNAME "/res/edje")
 #endif
 
 #if !defined(ICONDIR)
-#define ICONDIR "/usr/apps/org.tizen.wallpaper-ui-service/res/icons"
+#define ICONDIR tzplatform_mkpath(TZ_SYS_RO_ICONS, "wallpaper-ui-service.png")
 #endif
 
 #define EXTRA_KEY_FILE "file_path"

diff --git a/packaging/org.tizen.wallpaper-ui-service.spec b/packaging/org.tizen.wallpaper-ui-service.spec
index 8d3623f..6f1ca9e 100755 (executable)
--- a/packaging/org.tizen.wallpaper-ui-service.spec
+++ b/packaging/org.tizen.wallpaper-ui-service.spec
@@ -1,6 +1,6 @@
-%define PREFIX    /usr/apps/%{name}
+%define PREFIX    %{TZ_SYS_RO_APP}/%{name}
 %define RESDIR    %{PREFIX}/res
-%define PREFIXRW  /opt/usr/apps/%{name}
+%define PREFIXRW  %{TZ_SYS_RO_APP}/%{name}
 
 Name:       org.tizen.wallpaper-ui-service
 Summary:    wallpaper-ui-service window
@@ -34,6 +34,7 @@ BuildRequires: cmake
 BuildRequires: edje-tools
 BuildRequires: gettext-tools
 BuildRequires: hash-signer
+BuildRequires: pkgconfig(libtzplatform-config)
 
 Requires(post): /usr/bin/vconftool
 
@@ -107,6 +108,7 @@ rm -rf %{buildroot}
 /etc/smack/accesses.d/%{name}.efl
 /usr/apps/org.tizen.wallpaper-ui-service/author-signature.xml
 /usr/apps/org.tizen.wallpaper-ui-service/signature1.xml
+
 %attr(-,app,app) %dir /opt/usr/apps/org.tizen.wallpaper-ui-service/shared
 %attr(-,app,app) %dir /opt/usr/apps/org.tizen.wallpaper-ui-service/shared/res
 %attr(-,app,app) %dir /opt/usr/apps/org.tizen.wallpaper-ui-service/data