Change directory path to use tzplatform-config

Change-Id: I61363ed87793bd8dbc4ee2d6aa8b7a0b99086e50

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c53a5b..7ae4c95 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(INCLUDEDIR "\${prefix}/include")
 
 # Set required packages
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED glib-2.0 gudev-1.0)
+pkg_check_modules(pkgs REQUIRED glib-2.0 gudev-1.0 libtzplatform-config)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/include/co_network.h b/include/co_network.h
index fc633b6..36ad3b8 100644 (file)
--- a/include/co_network.h
+++ b/include/co_network.h
@@ -60,8 +60,6 @@ __BEGIN_DECLS
  */
 #define PROP_MODEM_READ_ESN_FOR_ACTIVATION  "esn_for_activation"
 
-#define NETWORK_MCC_MNC_OPER_LIST_GSMA_DB "/opt/dbspace/.mcc_mnc_oper_list.db"
-
 enum tcore_network_service_domain_type {
        TCORE_NETWORK_SERVICE_DOMAIN_TYPE_CIRCUIT,
        TCORE_NETWORK_SERVICE_DOMAIN_TYPE_PACKET

diff --git a/packaging/libtcore.spec b/packaging/libtcore.spec
index 9ef2df5..6f1a620 100644 (file)
--- a/packaging/libtcore.spec
+++ b/packaging/libtcore.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 2
-%define patchlevel 94
+%define patchlevel 95
 
 Name:           libtcore
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -12,6 +12,7 @@ Source0:        libtcore-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(libtzplatform-config)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 

diff --git a/src/core_object/co_network.c b/src/core_object/co_network.c
index 35db47e..acf5d29 100644 (file)
--- a/src/core_object/co_network.c
+++ b/src/core_object/co_network.c
@@ -22,6 +22,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <tzplatform_config.h>
+
 #include <glib.h>
 
 #include "tcore.h"
@@ -33,6 +35,8 @@
 #include "co_network.h"
 #include "storage.h"
 
+#define NETWORK_MCC_MNC_OPER_LIST_GSMA_DB tzplatform_mkpath(TZ_SYS_DB, ".mcc_mnc_oper_list.db")
+
 struct private_object_data {
        struct tcore_network_operations *ops[TCORE_OPS_TYPE_MAX];