TIVI-1436: Fix install path for package-manager

Change-Id: I8ebcc1df8419cfc0d2c2b9fa2509ff6c3bd5d6b6

diff --git a/packaging/wrt-installer.changes b/packaging/wrt-installer.changes
index d04463a..05d933e 100644 (file)
--- a/packaging/wrt-installer.changes
+++ b/packaging/wrt-installer.changes
@@ -1,3 +1,6 @@
+* Fri Aug 30 2013 Rusty Lynch <rusty.lynch@intel.com> accepted/tizen/20130710.213949@7b013e6
+- TIVI-1436: Fix install path for package-manager
+
 * Tue Jul 09 2013 Baptiste DURAND <baptiste.durand@eurogiciel.fr> accepted/tizen/20130701.201441@f00668f
 - Remove hardcoded lib path in spec and CMakelists
 - Add build config for decrypt support

diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec
index 935c607..72c4202 100644 (file)
--- a/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@ -5,8 +5,7 @@ Summary:    Installer for tizen Webruntime
 Version:    0.1.58.2
 Release:    1
 Group:      Development/Libraries
-License:    Apache License, Version 2.0
-URL:        N/A
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source100:  wrt-preinstall-widgets.service
 Source1001:    wrt-installer.manifest
@@ -113,7 +112,7 @@ rm -rf %{buildroot}
 chmod +s /usr/bin/wrt-installer
 
 #symlink for package manager
-ln -sf /usr/bin/wrt-installer /usr/etc/package-manager/backend/wgt
+ln -sf /usr/bin/wrt-installer /etc/package-manager/backend/wgt
 
 #for booting recovery
 mkdir -p /opt/share/widget/temp_info
@@ -126,7 +125,7 @@ mkdir -p /opt/share/icons/default/small
 %files
 %manifest %{name}.manifest
 %attr(755,root,root) %{_bindir}/wrt-installer
-/usr/etc/package-manager/backendlib/libwgt.so
+/etc/package-manager/backendlib/libwgt.so
 %{_datadir}/license/%{name}
 %{_unitdir}/graphical.target.wants/wrt-preinstall-widgets.service
 %{_unitdir}/wrt-preinstall-widgets.service

diff --git a/src/jobs/widget_install/task_install_ospsvc.cpp b/src/jobs/widget_install/task_install_ospsvc.cpp
index 30c8101..b953a26 100644 (file)
--- a/src/jobs/widget_install/task_install_ospsvc.cpp
+++ b/src/jobs/widget_install/task_install_ospsvc.cpp
@@ -41,7 +41,7 @@ using namespace WrtDB;
 
 namespace {
 const int MAX_BUF_SIZE = 128;
-const char* OSP_INSTALL_STR = "/usr/etc/package-manager/backend/tpk -iv ";
+const char* OSP_INSTALL_STR = "/etc/package-manager/backend/tpk -iv ";
 }
 
 namespace Jobs {

diff --git a/src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp b/src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp
index 572b130..e1e015e 100644 (file)
--- a/src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp
+++ b/src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp
@@ -32,7 +32,7 @@ using namespace WrtDB;
 
 namespace {
 const int MAX_BUF_SIZE = 128;
-const char* OSP_INSTALL_STR = "/usr/etc/package-manager/backend/tpk -uv ";
+const char* OSP_INSTALL_STR = "/etc/package-manager/backend/tpk -uv ";
 }
 
 namespace Jobs {

diff --git a/src/pkg-manager/CMakeLists.txt b/src/pkg-manager/CMakeLists.txt
index c1ce69d..eda46c2 100755 (executable)
--- a/src/pkg-manager/CMakeLists.txt
+++ b/src/pkg-manager/CMakeLists.txt
@@ -53,13 +53,13 @@ SET_TARGET_PROPERTIES(${TARGET_BACKEND_LIB} PROPERTIES
 )
 
 INSTALL(TARGETS ${TARGET_BACKEND_LIB}
-    DESTINATION etc/package-manager/backendlib
+    DESTINATION /etc/package-manager/backendlib
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
 
 #SYMLINK
 set(SYMLINK_USE OFF)
-set(SYMLINK_DEST "${CMAKE_INSTALL_PREFIX}/etc/package-manager")
+set(SYMLINK_DEST "$/etc/package-manager")
 
 IF(SYMLINK_USE)
     ADD_CUSTOM_COMMAND(OUTPUT ${SYMLINK_DEST}/backend/wgt