change db path and fix permission error

Change-Id: Ie5be886361b1197985c5842be9effc93d58e729e
Signed-off-by: HyiHong Chae <hh.chae@samsung.com>

diff --git a/packaging/mtp-initiator.spec b/packaging/mtp-initiator.spec
index 9892ec3978ee1381369708e290820a1bcbcf6bc8..adb51e4c8a78f91f626b4481aadee1c4ca1b8c8c 100755 (executable)
--- a/packaging/mtp-initiator.spec
+++ b/packaging/mtp-initiator.spec
@@ -1,6 +1,6 @@
 Name:       mtp-initiator
 Summary:    mtp(media transfer protocol) initiator
-Version:    1.4.9
+Version:    1.4.10
 Release:    1
 Group:      Network & Connectivity/Other
 License:    Apache-2.0
@@ -18,6 +18,7 @@ BuildRequires:  pkgconfig(libmtp)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(capi-base-common)
+Buildrequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  python
 BuildRequires:  python-xml
 Requires:  security-config
@@ -36,6 +37,11 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
 make %{?jobs:-j%jobs}
 
+%post
+mkdir -p %TZ_SYS_DB/mtp
+chown network_fw:network_fw %TZ_SYS_DB/mtp
+chsmack -a "System::Shared" --transmute %TZ_SYS_DB/mtp
+
 %install
 rm -rf %{buildroot}
 

diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index b34eb4dca08c254618b8e194a48c7b8d9220b596..dfd85c710838d08917428e05fe3d8546f37f295a 100755 (executable)
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/daemon)
 include_directories(${CMAKE_SOURCE_DIR}/src/daemon/include)
 
 INCLUDE(FindPkgConfig)
-       pkg_check_modules(mtp_pkgs REQUIRED glib-2.0 gio-2.0 libmtp dlog gio-unix-2.0 sqlite3 capi-base-common)
+       pkg_check_modules(mtp_pkgs REQUIRED glib-2.0 gio-2.0 libmtp dlog gio-unix-2.0 sqlite3 capi-base-common libtzplatform-config)
 
 FOREACH(flag ${mtp_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/src/daemon/include/mtp_daemon.h b/src/daemon/include/mtp_daemon.h
index b4af2ccb1fcb46dd5433b8d5327d6ede40407925..7373e33a3560476eef6c86dd5eeffd4187f59bc9 100755 (executable)
--- a/src/daemon/include/mtp_daemon.h
+++ b/src/daemon/include/mtp_daemon.h
@@ -31,6 +31,7 @@
 #include <tizen.h>
 #include <dlog.h>
 #include <libmtp.h>
+#include <tzplatform_config.h>
 #include "mtp_gdbuslib.h"
 
 #define MTP_DBUS_SERVICE       "org.tizen.mtp"
@@ -58,7 +59,7 @@
                } \
        } while (0)
 
-#define MTP_DB_FILE "/tmp/.mtp.db"
+#define MTP_DB_FILE tzplatform_mkpath(TZ_SYS_DB, "mtp/.mtp.db")
 #define MTP_DB_TABLE "mtp_object_info"
 #define MTP_ERROR_DB -970