From 4f1fa44e2ed879868f187b325b145db5ad49f4a8 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <s89.jang@samsung.com>
Date: Mon, 18 Apr 2016 17:00:22 +0900
Subject: [PATCH] Fix build fail issue

Change-Id: I6c8cd8a93108cb0d955ead98f5f7e35722de2ae4
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
---
 CMakeLists.txt               |  3 ++-
 include/pkgmgr-server.h      | 14 +++++++++++++-
 packaging/pkgmgr-server.spec |  1 +
 src/db.c                     |  1 -
 src/pkgmgr-server.c          |  1 -
 src/request.c                | 10 ++++++----
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ab31aa..8e115b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,8 @@ pkg_check_modules(SERVER_DEPS REQUIRED
 		libtzplatform-config
 		drm-service-core-tizen
 		sqlite3
-		pkgmgr)
+		pkgmgr
+		pkgmgr-installer)
 FOREACH(SERVER_FLAGS ${SERVER_DEPS_CFLAGS})
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SERVER_FLAGS}")
 ENDFOREACH(SERVER_FLAGS)
diff --git a/include/pkgmgr-server.h b/include/pkgmgr-server.h
index d4cadde..6bb8f08 100644
--- a/include/pkgmgr-server.h
+++ b/include/pkgmgr-server.h
@@ -25,12 +25,24 @@
 
 #include <sys/types.h>
 #include <glib.h>
+#include <dlog.h>
 
 #ifdef LOG_TAG
 #undef LOG_TAG
 #endif /* LOG_TAG */
 #define LOG_TAG "PKGMGR_SERVER"
-#include "package-manager-debug.h"
+
+#ifndef ERR
+#define ERR(fmt, args...) LOGE("[%s:%d] "fmt"\n", __func__, __LINE__, ##args)
+#endif
+
+#ifndef DBG
+#define DBG(fmt, args...) LOGD("[%s:%d] "fmt"\n", __func__, __LINE__, ##args)
+#endif
+
+#ifndef INFO
+#define INFO(fmt, args...) LOGI("[%s:%d] "fmt"\n", __func__, __LINE__, ##args)
+#endif
 
 #define CONF_FILE "/etc/package-manager/server/.config"
 #define DESKTOP_FILE_DIRS "/usr/share/install-info/desktop.conf"
diff --git a/packaging/pkgmgr-server.spec b/packaging/pkgmgr-server.spec
index 21fe2fc..f1ab500 100644
--- a/packaging/pkgmgr-server.spec
+++ b/packaging/pkgmgr-server.spec
@@ -22,6 +22,7 @@ BuildRequires:  pkgconfig(xdgmime)
 BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(pkgmgr)
+BuildRequires:  pkgconfig(pkgmgr-installer)
 BuildRequires:  pkgconfig(drm-service-core-tizen)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgmgr-info-parser-devel
diff --git a/src/db.c b/src/db.c
index c57f995..68b8cdf 100644
--- a/src/db.c
+++ b/src/db.c
@@ -22,7 +22,6 @@
 #include <sqlite3.h>
 
 #include <package-manager.h>
-#include <package-manager-debug.h>
 
 #include "pkgmgr-server.h"
 
diff --git a/src/pkgmgr-server.c b/src/pkgmgr-server.c
index 17a8617..f4e3463 100644
--- a/src/pkgmgr-server.c
+++ b/src/pkgmgr-server.c
@@ -45,7 +45,6 @@
 #include "pkgmgr_installer.h"
 #include "pkgmgr-server.h"
 #include "pm-queue.h"
-#include "comm_config.h"
 #include "package-manager.h"
 
 #define BUFMAX 128
diff --git a/src/request.c b/src/request.c
index 35587d1..a9a2e5d 100644
--- a/src/request.c
+++ b/src/request.c
@@ -1,14 +1,16 @@
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/time.h>
 
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "comm_config.h"
 #include "pm-queue.h"
 #include "pkgmgr-server.h"
 #include "package-manager.h"
-#include "package-manager-debug.h"
+
+#define PKGMGR_DBUS_SERVICE "org.tizen.pkgmgr"
+#define PKGMGR_DBUS_OBJECT_PATH "/org/tizen/pkgmgr"
 
 static const char instropection_xml[] =
 	"<node>"
@@ -1046,7 +1048,7 @@ static void __on_bus_acquired(GDBusConnection *connection, const gchar *name,
 	DBG("on bus acquired");
 
 	reg_id = g_dbus_connection_register_object(connection,
-			COMM_PKGMGR_DBUS_OBJECT_PATH,
+			PKGMGR_DBUS_OBJECT_PATH,
 			instropection_data->interfaces[0],
 			&interface_vtable, NULL, NULL, &err);
 
@@ -1072,7 +1074,7 @@ int __init_request_handler(void)
 {
 	instropection_data = g_dbus_node_info_new_for_xml(instropection_xml, NULL);
 
-	owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM, COMM_PKGMGR_DBUS_SERVICE,
+	owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM, PKGMGR_DBUS_SERVICE,
 			G_BUS_NAME_OWNER_FLAGS_NONE, __on_bus_acquired,
 			__on_name_acquired, __on_name_lost, NULL, NULL);
 
-- 
2.7.4