Revert removing db-util depencenty because of the localized collate error

Change-Id: I9a992a443a221f5d58e980dda1ec56bf28312bb7

diff --git a/Makefile.am b/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index aa806f3..456c881
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ COMMON_CFLAGS = -I${srcdir}/lib/include \
                $(GTHREAD_CFLAGS) \
                $(DLOG_CFLAGS) \
                $(SQLITE3_CFLAGS) \
+               $(DB_UTIL_CFLAGS) \
                $(INIPARSER_CFLAGS) \
                $(LIBPMCONTROL_CFLAGS) \
                $(LIBSYSTEMDLOGIN_CFLAGS) \
@@ -36,6 +37,7 @@ COMMON_LDADD =        libmedia-utils.la \
                $(GTHREAD_LIBS) \
                $(DLOG_LIBS) \
                $(SQLITE3_LIBS) \
+               $(DB_UTIL_LIBS) \
                $(INIPARSER_LIBS) \
                $(LIBPMCONTROL_LIBS) \
                $(LIBSYSTEMDLOGIN_LIBS) \
@@ -70,6 +72,7 @@ libmedia_utils_la_CFLAGS = -I${srcdir}/lib/include \
                              $(DLOG_CFLAGS) \
                              $(GIO_CFLAGS) \
                              $(SQLITE3_CFLAGS) \
+                             $(DB_UTIL_CFLAGS) \
                              $(PHONESTATUS_CFLAGS) \
                              $(TZ_PLATFORM_CONFIG_CFLAGS) \
                              $(LIBSMACK_CFLAGS) \
@@ -82,6 +85,7 @@ libmedia_utils_la_LIBADD  =   $(GLIB_LIBS) \
                               $(DLOG_LIBS) \
                              $(GIO_LIBS) \
                              $(SQLITE3_LIBS) \
+                             $(DB_UTIL_LIBS) \
                              $(PHONESTATUS_LIBS) \
                              $(TZ_PLATFORM_CONFIG_LIBS) \
                              $(LIBSMACK_LIBS) \
@@ -112,6 +116,7 @@ media_server_SOURCES = src/common/media-common-utils.c \
 
 media_server_CFLAGS = -I${srcdir}/src/server/include \
                        $(SQLITE3_CFLAGS) \
+                       $(DB_UTIL_CFLAGS) \
                        $(COMMON_CFLAGS) \
                         $(PHONESTATUS_CFLAGS) \
                         $(SYSTEM_INFO_CFLAGS)
@@ -196,6 +201,7 @@ mediadb_update_CFLAGS = -I${srcdir}/lib/include \
                         -D_FILE_OFFSET_BITS=64 \
                        $(GTHREAD_CFLAGS) \
                        $(SQLITE3_CFLAGS) \
+                       $(DB_UTIL_CFLAGS) \
                        $(GLIB_CFLAGS) \
                        $(GIO_CFLAGS)
 
@@ -206,6 +212,7 @@ mediadb_update_LDFLAGS = -pie
 mediadb_update_LDADD = libmedia-utils.la \
                        $(GLIB_LIBS) \
                        $(SQLITE3_LIBS) \
+                       $(DB_UTIL_LIBS) \
                        $(GTHREAD_LIBS) \
                        $(GIO_LIBS) \
                        -ldl

diff --git a/configure.ac b/configure.ac
old mode 100644 (file)
new mode 100755 (executable)
index 329f102..675fc30
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,10 @@ PKG_CHECK_MODULES(SQLITE3, sqlite3)
 AC_SUBST(SQLITE3_CFLAGS)
 AC_SUBST(SQLITE3_LIBS)
 
+PKG_CHECK_MODULES(DB_UTIL, db-util)
+AC_SUBST(DB_UTIL_CFLAGS)
+AC_SUBST(DB_UTIL_LIBS)
+
 PKG_CHECK_MODULES(INIPARSER, iniparser)
 AC_SUBST(INIPARSER_CFLAGS)
 AC_SUBST(INIPARSER_LIBS)

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 2ebbbd7..23c683c 100755 (executable)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -23,6 +23,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/smack.h>
+#include <db-util.h>
 #include "media-server-ipc.h"
 #include "media-util-dbg.h"
 #include "media-util-internal.h"
@@ -70,9 +71,9 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
 
        /*Connect DB*/
        if (need_write)
-               ret = sqlite3_open_v2(db_path, db_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
+               ret = db_util_open_with_options(db_path, db_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
        else
-               ret = sqlite3_open_v2(db_path, db_handle, SQLITE_OPEN_READONLY, NULL);
+               ret = db_util_open_with_options(db_path, db_handle, SQLITE_OPEN_READONLY, NULL);
 
 
        if (SQLITE_OK != ret) {

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index c8772c3..b1291c7 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -16,6 +16,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(libsystemd-login)