Update pkgmgr

from: ceb738c1b4e04b9b07cbbc87ec0f4c949e4fbab3
to  : 4609bb7d923418313c9237adfac952dc973f5766

[NOTE]
This commit have been checked compiling,
but the command of pkgmgr have been failed
because the pkgmgr have not been updeted yet.

Change-Id: I23910d4f5339e5a2b8362dce4e87346c63a586a2
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

8 files changed, 30 insertions, 257 deletions

diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/0001-remove-TizenConfig.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/0001-remove-TizenConfig.patch
index 80e3396..5b20c8b 100644
--- a/meta-application-manager/recipes-application-framework/pkgmgr/files/0001-remove-TizenConfig.patch
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/files/0001-remove-TizenConfig.patch
@@ -1,12 +1,10 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -6,8 +6,7 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
- SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+@@ -3,7 +3,6 @@
+ SET(CMAKE_SKIP_BUILD_RPATH true)
  
  PROJECT(package-manager C)
 -INCLUDE(TizenCommon)
- 
- SET(VERSION 0.1.68)
  SET(VERSION_MAJOR 0)
-
+ SET(VERSION ${VERSION_MAJOR}.1.68)
+ 
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/0001_change-tzglobalapp-to-aglglobalapp.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/0001_change-tzglobalapp-to-aglglobalapp.patch
deleted file mode 100644
index 2e91fd0..0000000
--- a/meta-application-manager/recipes-application-framework/pkgmgr/files/0001_change-tzglobalapp-to-aglglobalapp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec
-index 61e4711..9b69e59 100644
---- a/packaging/pkgmgr.spec
-+++ b/packaging/pkgmgr.spec
-@@ -151,8 +151,8 @@ chsmack -a '*' %{TZ_SYS_RW_PACKAGES}
- %{_bindir}/pkg_getsize
- %{_bindir}/pkginfo
- %{_bindir}/pkgmgr-install
--%attr(-,tizenglobalapp,root) %dir %{TZ_SYS_RW_PACKAGES}
--%attr(-,tizenglobalapp,root) %{TZ_SYS_RW_PACKAGES}/org.tizen.pkgmgr-install.xml
-+%attr(-,aglglobalapp,root) %dir %{TZ_SYS_RW_PACKAGES}
-+%attr(-,aglglobalapp,root) %{TZ_SYS_RW_PACKAGES}/org.tizen.pkgmgr-install.xml
- %{_datadir}/mime/packages/mime.wac.xml
- %{_datadir}/mime/packages/mime.tpk.xml
- %exclude %{_includedir}/pkgmgr/comm_client.h
-diff --git a/tool/pkg_info.c b/tool/pkg_info.c
-index cd7d461..49b1119 100644
---- a/tool/pkg_info.c
-+++ b/tool/pkg_info.c
-@@ -2227,7 +2227,7 @@ int main(int argc, char *argv[])
- 
- 
- 	if(getuid() == OWNER_ROOT) {
--		printf("User is Root! : Only tizenglobalapp or regular user are allowed\n");
-+		printf("User is Root! : Only aglglobalapp or regular user are allowed\n");
- 		return -1;
- 	}
- 	
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/0002-pkgmgr-initdb.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/0002-pkgmgr-initdb.patch
deleted file mode 100644
index 6dfa9e6..0000000
--- a/meta-application-manager/recipes-application-framework/pkgmgr/files/0002-pkgmgr-initdb.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/tool/pkg_createdb.c
-+++ b/tool/pkg_createdb.c
-@@ -261,15 +261,21 @@
- 	for (i = 0; files[i]; i++) {
- 		ret = chown(files[i], GLOBAL_USER, OWNER_ROOT);
- 		if (ret == -1) {
-+			if (files[i] == journal_file && errno == ENOENT)
-+				continue;
- 			strerror_r(errno, buf, sizeof(buf));
--			_E("FAIL : chown %s %d.%d, because %s", db_file, GLOBAL_USER, OWNER_ROOT, buf);
-+			//_E("FAIL : chown %s %d.%d, because %s", db_file, GLOBAL_USER, OWNER_ROOT, buf);
-+			_E("FAIL : chown %s %d.%d, because %s", files[i], GLOBAL_USER, OWNER_ROOT, buf);
- 			return -1;
- 		}
- 
- 		ret = chmod(files[i], S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
- 		if (ret == -1) {
-+			if (files[i] == journal_file && errno == ENOENT)
-+				continue;
- 			strerror_r(errno, buf, sizeof(buf));
--			_E("FAIL : chmod %s 0664, because %s", db_file, buf);
-+			//_E("FAIL : chmod %s 0664, because %s", db_file, buf);
-+			_E("FAIL : chmod %s 0664, because %s", files[i], buf);
- 			return -1;
- 		}
- 	}
-@@ -357,7 +363,10 @@
- 		return -1;
- 	}
- 
--	setuid(OWNER_ROOT);
-+	ret=setuid(OWNER_ROOT);
-+	if(ret!=0){
-+		printf("@%d__setuid err = %d\n",__LINE__,errno);
-+	}
- 	ret = createdb_change_perm(PACKAGE_INFO_DB_FILE);
- 	if (ret == -1) {
- 		_E("cannot chown.");
-
---- a/tool/pkg_initdb.c
-+++ b/tool/pkg_initdb.c
-@@ -208,15 +208,21 @@
- 	for (i = 0; files[i]; i++) {
- 		ret = chown(files[i], GLOBAL_USER, OWNER_ROOT);
- 		if (ret == -1) {
-+			if (files[i] == journal_file && errno == ENOENT)
-+				continue;
- 			strerror_r(errno, buf, sizeof(buf));
--			_E("FAIL : chown %s %d.%d, because %s", db_file, GLOBAL_USER, OWNER_ROOT, buf);
-+			//_E("FAIL : chown %s %d.%d, because %s", db_file, GLOBAL_USER, OWNER_ROOT, buf);
-+			_E("FAIL : chown %s %d.%d, because %s", files[i], GLOBAL_USER, OWNER_ROOT, buf);
- 			return -1;
- 		}
- 
- 		ret = chmod(files[i], S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
- 		if (ret == -1) {
-+			if (files[i] == journal_file && errno == ENOENT)
-+				continue;
- 			strerror_r(errno, buf, sizeof(buf));
--			_E("FAIL : chmod %s 0664, because %s", db_file, buf);
-+			//_E("FAIL : chmod %s 0664, because %s", db_file, buf);
-+			_E("FAIL : chmod %s 0664, because %s", files[i], buf);
- 			return -1;
- 		}
- 	}
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/0003-remove-efl-pkgmgr.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/0003-remove-efl-pkgmgr.patch
deleted file mode 100644
index 2a75a56..0000000
--- a/meta-application-manager/recipes-application-framework/pkgmgr/files/0003-remove-efl-pkgmgr.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/tool/pkgmgr-install.c
-+++ b/tool/pkgmgr-install.c
-@@ -97,8 +97,7 @@
- 
- gboolean __term(void *data)
- {
--	ecore_main_loop_quit();
--
-+//	ecore_main_loop_quit();
- 	return FALSE;
- }
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,7 +23,7 @@
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/comm )
- 
- INCLUDE(FindPkgConfig)
--pkg_check_modules(pkgs REQUIRED security-server dlog ecore ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config notification)
-+pkg_check_modules(pkgs REQUIRED security-server dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config notification)
- 
- FOREACH(flag ${pkgs_CFLAGS})
- 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-
---- a/tool/CMakeLists.txt
-+++ b/tool/CMakeLists.txt
-@@ -6,13 +6,13 @@
- 
- INCLUDE(FindPkgConfig)
- 
--pkg_check_modules(pkgs_initdb REQUIRED libsmack ecore dbus-1 ail libxml-2.0 bundle pkgmgr-parser vconf security-server pkgmgr-info libtzplatform-config)
-+pkg_check_modules(pkgs_initdb REQUIRED libsmack dbus-1 ail libxml-2.0 bundle pkgmgr-parser vconf security-server pkgmgr-info libtzplatform-config)
- FOREACH(flag ${pkgs_initdb_CFLAGS})
- 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
- ENDFOREACH(flag)
- 
- 
--pkg_check_modules(pkgs_test REQUIRED ecore dbus-1 ail libxml-2.0 bundle pkgmgr-parser vconf security-server pkgmgr-info libtzplatform-config)
-+pkg_check_modules(pkgs_test REQUIRED dbus-1 ail libxml-2.0 bundle pkgmgr-parser vconf security-server pkgmgr-info libtzplatform-config)
- FOREACH(flag ${pkgs_test_CFLAGS})
- 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
- ENDFOREACH(flag)
-
---- a/server/src/pkgmgr-server.c
-+++ b/server/src/pkgmgr-server.c
-@@ -34,8 +34,8 @@
- #include <fcntl.h>
- #include <glib.h>
- #include <signal.h>
--#include <Ecore.h>
--#include <Ecore_File.h>
-+//#include <Ecore.h>
-+//#include <Ecore_File.h>
- #include <ail.h>
- #include <pkgmgr-info.h>
- #include <pkgmgr/pkgmgr_parser.h>
-@@ -1140,7 +1140,7 @@
-                 __check_queue_status_for_exit() &&
- 			drawing_popup == 0) {
-                         if (!getenv("PMS_STANDALONE") && ail_db_update) {
--                                ecore_main_loop_quit();
-+                                //ecore_main_loop_quit();
-                                 return FALSE;
-                         }
-         }
-
-
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/Add_extralib.diff b/meta-application-manager/recipes-application-framework/pkgmgr/files/Add_extralib.diff
deleted file mode 100644
index efd9553..0000000
--- a/meta-application-manager/recipes-application-framework/pkgmgr/files/Add_extralib.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0a9211..96a28f1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--# 
-+#
- # Copyright (c) 2008 ~ 2010 Samsung Electronics Co., Ltd.
- # All rights reserved
- #
-@@ -37,7 +37,7 @@ FOREACH(flag ${pkgs_CFLAGS})
- 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
- ENDFOREACH(flag)
- 
--pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config notification)
-+pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config notification xdgmime security-server)
- 
- FOREACH(flag ${libpkgs_CFLAGS})
- 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-@@ -76,7 +76,7 @@ ADD_LIBRARY(${PKGMGR_CLIENT} SHARED ${libpkgmgr-client_SOURCES})
- SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES SOVERSION ${VERSION_MAJOR})
- SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES VERSION ${VERSION})
- SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES COMPILE_FLAGS "${libpkgmgr-client_CFLAGS}")
--TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT} pkgmgr_installer_client pkgmgr_installer_status_broadcast_server pkgmgr-info ${libpkgs_LDFLAGS})
-+TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT} pkgmgr_installer_client pkgmgr_installer_status_broadcast_server pkgmgr-info ${libpkgs_LDFLAGS} -ldl)
- ###################################################################################################
- 
- ###################################################################################################
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr-extraconf.inc b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr-extraconf.inc
index 914d02b..add049a 100644
--- a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr-extraconf.inc
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr-extraconf.inc
@@ -1,4 +1,3 @@
-SRC_URI += "file://Add_extralib.diff"
 SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch"
 
 do_compile_prepend_class-native() {
@@ -13,6 +12,4 @@ do_install_append() {
 RDEPENDS_${PN}_remove_class-native = "systemd-native"
 DEPENDS_remove_class-native = "dlog-native"
 
-RDEPENDS_${PN}-client += "pkgmgr-server"
-
 EXTRA_OECMAKE+="-DCMAKE_AR:PATH=ar"
\ No newline at end of file
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc
index 3b5fb27..2cda5ad 100644
--- a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc
@@ -6,10 +6,7 @@ PV = "0.2.89"
 PR = "r1"
 
 SRC_URI = " \
-	file://0001_change-tzglobalapp-to-aglglobalapp.patch \
 	file://0001-remove-TizenConfig.patch \
-	file://0002-pkgmgr-initdb.patch \
-	file://0003-remove-efl-pkgmgr.patch \
 	"
 
 S = "${WORKDIR}/git"
@@ -26,10 +23,6 @@ PROVIDES += "pkgmgr-client"
 #PROVIDES by pkgmgr
 
 
-#PROVIDES by pkgmgr-server
-PROVIDES += "pkgmgr-server"
-
-
 #PROVIDES by pkgmgr-types-dev
 PROVIDES += "pkgmgr-types-dev"
 
@@ -51,14 +44,12 @@ RDEPENDS = ""
 RDEPENDS_${PN}-client += "shared-mime-info"
 RDEPENDS_${PN}-client += "pkgmgr"
 
-#RDEPENDS of pkgmgr-server (${PN}-server)
-RDEPENDS_${PN}-server += "pkgmgr"
-
 #RDEPENDS of pkgmgr-types-dev (${PN}-types-dev)
 RDEPENDS_${PN}-types-dev += "pkgmgr"
 
 #RDEPENDS of pkgmgr-client-dev (${PN}-client-dev)
 RDEPENDS_${PN}-client-dev += "pkgmgr"
+RDEPENDS_${PN}-client-dev += "pkgmgr-client"
 
 #RDEPENDS of pkgmgr-installer-dev (${PN}-installer-dev)
 RDEPENDS_${PN}-installer-dev += "pkgmgr"
@@ -75,17 +66,16 @@ inherit gettext
 DEPENDS += "unzip"
 inherit tizen_cmake
 DEPENDS += "iniparser"
-DEPENDS += "notification"
-DEPENDS += "dbus"
 inherit pkgconfig
 DEPENDS += "dlog"
-DEPENDS += "security-server"
-DEPENDS += "ail"
 DEPENDS += "smack"
 DEPENDS += "bundle"
-DEPENDS += "app-core"
 DEPENDS += "tizen-platform-config"
 DEPENDS += "dbus-glib"
+DEPENDS += "glib-2.0"
+DEPENDS += "xdgmime"
+DEPENDS += "libslp-db-util"
+DEPENDS += "smack"
 DEPENDS_append_class-native = " fdupes-native"
 DEPENDS_append_class-target = " fdupes-native"
 
@@ -93,7 +83,7 @@ do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
- cp ${S}/packaging/pkgmgr.manifest ${S}/packaging/pkgmgr-client.manifest ${S}/packaging/pkgmgr-client-devel.manifest ${S}/packaging/pkgmgr-server.manifest ${S}/packaging/pkgmgr-installer.manifest ${S}/packaging/pkgmgr-installer-devel.manifest ${S}/packaging/pkgmgr-types-devel.manifest .
+ cp ${S}/packaging/pkgmgr.manifest ${S}/packaging/pkgmgr-client.manifest ${S}/packaging/pkgmgr-client-devel.manifest ${S}/packaging/pkgmgr-installer.manifest ${S}/packaging/pkgmgr-installer-devel.manifest ${S}/packaging/pkgmgr-types-devel.manifest .
  
  
 }
@@ -153,13 +143,16 @@ do_install() {
  rm -f ${D}/usr/lib/libpkgmgr_backend_lib_sample.so
  rm -f ${D}/usr/lib/libpkgmgr_parser_lib_sample.so
  
+ mkdir -p ${D}/etc/tmpfiles.d
+ install -m 0644 ${S}/packaging/pkgmgr.conf ${D}/etc/tmpfiles.d/pkgmgr.conf
+
  mkdir -p ${D}/package-manager/backend
  mkdir -p ${D}/package-manager/backendlib
- mkdir -p ${D}/opt/upgrade
- 
- mkdir -p ${D}/package-manager/server
  
- #find_lang package-manager
+ touch ${D}/package-manager/backend/default
+ chmod 755 ${D}/package-manager/backend/default
+ touch ${D}/package-manager/backend/pkgtool
+ chmod 755 ${D}/package-manager/backend/pkgtool
  
  #fdupes ${D}
  
@@ -172,12 +165,6 @@ pkg_postinst_pkgmgr-installer() {
     [ "x$D" == "x" ] && ldconfig
 }
 
-pkg_postinst_pkgmgr-server() {
-    #!/bin/sh -e
-
-    [ "x$D" == "x" ] && ldconfig
-}
-
 pkg_postinst_${PN}() {
     #!/bin/sh -e
 
@@ -187,6 +174,16 @@ pkg_postinst_${PN}() {
     update-mime-database $D/usr/share/mime
     chsmack -a '*' $D/usr/share/packages
 
+    # Create aglglobalapp user needed for global installation
+    useradd $TZ_SYS_GLOBALAPP_USER -r -c "system user for common applications" -g root
+
+    # change owner of TZ_USER_APP (/etc/skel/apps_rw) to aglglobalapp
+    saveHOME="$HOME"
+    HOME="${sysconfdir}/skel"
+    . "${sysconfdir}/tizen-platform.conf"
+
+    chown $TZ_SYS_GLOBALAPP_USER:root $TZ_USER_APP
+    HOME="$saveHOME"
 }
 
 pkg_postinst_pkgmgr-client() {
@@ -210,7 +207,6 @@ pkg_postrm_pkgmgr-installer() {
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
 PACKAGES += " pkgmgr-client "
 PACKAGES += " pkgmgr "
-PACKAGES += " pkgmgr-server "
 PACKAGES += " pkgmgr-types-dev "
 PACKAGES += " pkgmgr-client-dev "
 PACKAGES += " pkgmgr-installer-dev "
@@ -229,37 +225,14 @@ DIRFILES_${PN}-client += "/package-manager"
 pkgmgr_files = ""
 pkgmgr_files += "/package-manager/backend"
 pkgmgr_files += "/package-manager/backendlib"
-pkgmgr_files += "/opt/upgrade"
-pkgmgr_files += "/opt/upgrade/pkgmgr.patch.sh"
-pkgmgr_files += "/usr/bin/pkgcmd"
-pkgmgr_files += "/usr/bin/pkg_createdb"
-pkgmgr_files += "/usr/bin/pkg_createdb_user"
-pkgmgr_files += "/usr/bin/pkg_syncdb"
-pkgmgr_files += "/usr/bin/pkg_syncdb_user"
-pkgmgr_files += "/usr/bin/pkg_initdb"
-pkgmgr_files += "/usr/bin/pkg_initdb_user"
-pkgmgr_files += "/usr/bin/pkg_getsize"
-pkgmgr_files += "/usr/bin/pkginfo"
-pkgmgr_files += "/usr/bin/pkgmgr-install"
-pkgmgr_files += "%dir /usr/share/packages"
-pkgmgr_files += "/usr/share/packages/org.tizen.pkgmgr-install.xml"
-pkgmgr_files += "/usr/share/mime/packages/mime.wac.xml"
-pkgmgr_files += "/usr/share/mime/packages/mime.tpk.xml"
+pkgmgr_files += "/package-manager/backend/*"
+pkgmgr_files += "/etc/tmpfiles.d/pkgmgr.conf"
 MANIFESTFILES_${PN} = "pkgmgr.manifest"
 DIRFILES_${PN} = ""
 DIRFILES_${PN} += "/package-manager/backend"
 DIRFILES_${PN} += "/package-manager/backendlib"
 DIRFILES_${PN} += "/opt/upgrade"
 
-pkgmgr-server_files = ""
-pkgmgr-server_files += "/usr/share/dbus-1/system-services/org.tizen.slp.pkgmgr.service"
-pkgmgr-server_files += "/dbus-1/system.d/org.tizen.slp.pkgmgr.conf"
-pkgmgr-server_files += "/usr/bin/pkgmgr-server"
-pkgmgr-server_files += "/package-manager/server"
-CONFFILES_${PN}-server = ""
-CONFFILES_${PN}-server += "/dbus-1/system.d/org.tizen.slp.pkgmgr.conf"
-MANIFESTFILES_${PN}-server = "pkgmgr-server.manifest"
-
 pkgmgr-types-dev_files = ""
 pkgmgr-types-dev_files += "/usr/include/package-manager-types.h"
 pkgmgr-types-dev_files += "/usr/include/package-manager-plugin.h"
@@ -268,7 +241,6 @@ MANIFESTFILES_${PN}-types-dev = "pkgmgr-types-devel.manifest"
 
 pkgmgr-client-dev_files = ""
 pkgmgr-client-dev_files += "/usr/include/package-manager.h"
-pkgmgr-client-dev_files += "/usr/include/pkgmgr-dbinfo.h"
 pkgmgr-client-dev_files += "/usr/lib/pkgconfig/pkgmgr.pc"
 pkgmgr-client-dev_files += "/usr/lib/libpkgmgr-client.so"
 MANIFESTFILES_${PN}-client-dev = "pkgmgr-client-devel.manifest"
@@ -276,20 +248,14 @@ MANIFESTFILES_${PN}-client-dev = "pkgmgr-client-devel.manifest"
 pkgmgr-installer-dev_files = ""
 pkgmgr-installer-dev_files += "/usr/include/pkgmgr"
 pkgmgr-installer-dev_files += "/usr/include/pkgmgr/pkgmgr_installer.h"
-pkgmgr-installer-dev_files += "/usr/lib/pkgconfig/pkgmgr-installer-status-broadcast-server.pc"
 pkgmgr-installer-dev_files += "/usr/lib/pkgconfig/pkgmgr-installer.pc"
-pkgmgr-installer-dev_files += "/usr/lib/pkgconfig/pkgmgr-installer-client.pc"
 pkgmgr-installer-dev_files += "/usr/lib/libpkgmgr_installer.so"
-pkgmgr-installer-dev_files += "/usr/lib/libpkgmgr_installer_client.so"
-pkgmgr-installer-dev_files += "/usr/lib/libpkgmgr_installer_status_broadcast_server.so"
 MANIFESTFILES_${PN}-installer-dev = "pkgmgr-installer-devel.manifest"
 DIRFILES_${PN}-installer-dev = ""
 DIRFILES_${PN}-installer-dev += "/usr/include/pkgmgr"
 
 pkgmgr-installer_files = ""
 pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer.so.*"
-pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer_status_broadcast_server.so.*"
-pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer_client.so.*"
 MANIFESTFILES_${PN}-installer = "pkgmgr-installer.manifest"
 
 FILES_${PN}-client = "${pkgmgr-client_files}"
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_git.bb b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_git.bb
index 74a3593..0630f10 100644
--- a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_git.bb
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;tag=ceb738c1b4e04b9b07cbbc87ec0f4c949e4fbab3;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;tag=4609bb7d923418313c9237adfac952dc973f5766;nobranch=1"
 
 BBCLASSEXTEND += " native "