Fix Build errors

1. Fixed dependency issue with web-provider
2. Added missing module dependency
3. Changed install path
4. Removed unused service

Change-Id: Iddcb4f57cce31ec5a79490da524a14c500d0f279

diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec
index e462536..3c0e5cb 100644 (file)
--- a/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@ -7,7 +7,6 @@ Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source100:  wrt-preinstall-widgets.service
 Source1001:    wrt-installer.manifest
 BuildRequires:  cmake
 BuildRequires:  edje-tools
@@ -125,7 +124,6 @@ mkdir -p /opt/share/icons/default/small
 %files
 %manifest %{name}.manifest
 %attr(755,root,root) %{_bindir}/wrt-installer
-%{_unitdir}/graphical.target.wants/wrt-preinstall-widgets.service
 /usr/etc/package-manager/backendlib/libwgt.so
 %attr(644,root,root) /usr/etc/wrt-installer/*.xsd
 %{_datadir}/license/%{name}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93318c9..9c69f7b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,7 +115,7 @@ ENDIF(LB_SUPPORT)
 MESSAGE(STATUS "add -DSEP_INSTALLER")
 ADD_DEFINITIONS("-DSEP_INSTALLER")
 
-IF(DECRYPT_SUPPORT)
+IF(LIVEBOX_SUPPORT)
 PKG_CHECK_MODULES(INSTALLER_STATIC_DEP
     dpl-efl
     dpl-event-efl
@@ -133,7 +133,7 @@ PKG_CHECK_MODULES(INSTALLER_STATIC_DEP
     libsmack
     REQUIRED
 )
-ELSE(DECRYPT_SUPPORT)
+ELSE(LIVEBOX_SUPPORT)
 PKG_CHECK_MODULES(INSTALLER_STATIC_DEP
     dpl-efl
     dpl-event-efl
@@ -142,6 +142,7 @@ PKG_CHECK_MODULES(INSTALLER_STATIC_DEP
     dpl-wrt-dao-rw
     wrt-commons-custom-handler-dao-rw
     wrt-commons-security-origin-dao
+    wrt-commons-widget-interface-dao
     wrt-plugins-types
     pkgmgr-installer
     pkgmgr-parser
@@ -149,7 +150,7 @@ PKG_CHECK_MODULES(INSTALLER_STATIC_DEP
     libsmack
     REQUIRED
 )
-ENDIF(DECRYPT_SUPPORT)
+ENDIF(LIVEBOX_SUPPORT)
 
 IF(LIVEBOX_SUPPORT)
 PKG_CHECK_MODULES(web-provider)

diff --git a/src/pkg-manager/CMakeLists.txt b/src/pkg-manager/CMakeLists.txt
index eda46c2..3755eff 100755 (executable)
--- a/src/pkg-manager/CMakeLists.txt
+++ b/src/pkg-manager/CMakeLists.txt
@@ -53,7 +53,7 @@ SET_TARGET_PROPERTIES(${TARGET_BACKEND_LIB} PROPERTIES
 )
 
 INSTALL(TARGETS ${TARGET_BACKEND_LIB}
-    DESTINATION /etc/package-manager/backendlib
+    DESTINATION /usr/etc/package-manager/backendlib
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )