db, data directory path changed(/opt -> /opt/usr)

Change-Id: I6e4aae163d3d26a5fd3442b8766bc14c4dbde8e2
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e61b2a0a2fd3d2e9c0ed5a2f41f878be3688594..7aabf9aa64de04dfe554e6db7842d955e86bc8cb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,8 @@ ENDIF(_MSG_WEARABLE_PROFILE)
 ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 
 ADD_DEFINITIONS(-DTZ_SYS_RO_APP_PATH="${TZ_SYS_RO_APP}")
-ADD_DEFINITIONS(-DTZ_SYS_DATA_PATH="${TZ_SYS_DATA}")
-ADD_DEFINITIONS(-DTZ_SYS_DB_PATH="${TZ_SYS_DB}")
+ADD_DEFINITIONS(-DTZ_SYS_GLOBALUSER_DATA_PATH="${TZ_SYS_GLOBALUSER_DATA}")
+ADD_DEFINITIONS(-DTZ_SYS_GLOBALUSER_DB_PATH="${TZ_SYS_GLOBALUSER_DB}")
 ADD_DEFINITIONS(-DTZ_SYS_HOME_PATH="${TZ_SYS_HOME}")
 
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)

diff --git a/include/common/MsgInternalTypes.h b/include/common/MsgInternalTypes.h
index 4d529b9ea8ec6b47da635fe64aca6d4631158e22..11832dd77c00319b161735472a30de7ce67f378f 100755 (executable)
--- a/include/common/MsgInternalTypes.h
+++ b/include/common/MsgInternalTypes.h
@@ -32,7 +32,7 @@
 /*==================================================================================================
                                                                                        DEFINES
 ==================================================================================================*/
-#define MSG_DATA_ROOT_PATH             TZ_SYS_DATA_PATH"/msg-service/"
+#define MSG_DATA_ROOT_PATH             TZ_SYS_GLOBALUSER_DATA_PATH"/msg-service/"
 #define MSG_DATA_PATH                          MSG_DATA_ROOT_PATH"msgdata/"
 #define MSG_SMIL_FILE_PATH             MSG_DATA_ROOT_PATH"smildata/"
 #define MSG_IPC_DATA_PATH                      MSG_DATA_ROOT_PATH"ipcdata/"

diff --git a/include/utils/MsgSqliteWrapper.h b/include/utils/MsgSqliteWrapper.h
index 3fd3dbc77e55bbb6ea1a48fac5a2cc42b6c8b914..3eb9e0542b77f62b6db870048770c33eae394110 100755 (executable)
--- a/include/utils/MsgSqliteWrapper.h
+++ b/include/utils/MsgSqliteWrapper.h
@@ -27,7 +27,7 @@
 /*==================================================================================================
                                                                                        DEFINES
 ==================================================================================================*/
-#define MSGFW_DB_NAME                          TZ_SYS_DB_PATH"/.msg_service.db"
+#define MSGFW_DB_NAME                          TZ_SYS_GLOBALUSER_DB_PATH"/.msg_service.db"
 
 #define MSGFW_MESSAGE_TABLE_NAME                               "MSG_MESSAGE_TABLE"
 #define MSGFW_FOLDER_TABLE_NAME                                        "MSG_FOLDER_TABLE"

diff --git a/packaging/msg-service.spec b/packaging/msg-service.spec
index 28fd2f6df35730a1a8aeba76f8b76935d856d864..217666e20708b4adeae6cb0f2b59f5d035da2811 100755 (executable)
--- a/packaging/msg-service.spec
+++ b/packaging/msg-service.spec
@@ -150,8 +150,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
                -DAPP_LOCALEDIR=%{APP_LOCALEDIR}   \
 %endif
                -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
-               -DTZ_SYS_DATA=%TZ_SYS_DATA \
-               -DTZ_SYS_DB=%TZ_SYS_DB \
+               -DTZ_SYS_GLOBALUSER_DATA=%TZ_SYS_GLOBALUSER_DATA \
+               -DTZ_SYS_GLOBALUSER_DB=%TZ_SYS_GLOBALUSER_DB \
                -DTZ_SYS_HOME=%TZ_SYS_HOME \
                -DTZ_SYS_BIN=%TZ_SYS_BIN \
 %ifarch i586
@@ -195,48 +195,48 @@ mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
 install -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/msg-server.socket
 %install_service sockets.target.wants msg-server.socket
 
-mkdir -p %{buildroot}%{TZ_SYS_DB}
-sqlite3 %{buildroot}%{TZ_SYS_DB}/.msg_service.db "PRAGMA journal_mode = PERSIST;"
-sqlite3 %{buildroot}%{TZ_SYS_DB}/.msg_service.db < %{buildroot}/usr/share/msg-service/msg-service-db.sql
+mkdir -p %{buildroot}%{TZ_SYS_GLOBALUSER_DB}
+sqlite3 %{buildroot}%{TZ_SYS_GLOBALUSER_DB}/.msg_service.db "PRAGMA journal_mode = PERSIST;"
+sqlite3 %{buildroot}%{TZ_SYS_GLOBALUSER_DB}/.msg_service.db < %{buildroot}/usr/share/msg-service/msg-service-db.sql
 
 rm %{buildroot}/usr/share/msg-service/msg-service-db.sql
 
 %post tools
 /sbin/ldconfig
 
-chmod 640 %{TZ_SYS_DB}/.msg_service.db
-chmod 660 %{TZ_SYS_DB}/.msg_service.db-journal
-
-mkdir -p -m 770 %{TZ_SYS_DATA}/msg-service
-mkdir -p -m 750 %{TZ_SYS_DATA}/msg-service/msgdata
-mkdir -p -m 750 %{TZ_SYS_DATA}/msg-service/smildata
-mkdir -p -m 770 %{TZ_SYS_DATA}/msg-service/ipcdata
-mkdir -p -m 750 %{TZ_SYS_DATA}/msg-service/msgdata/thumbnails
-
-chown messaging:priv_message_read %{TZ_SYS_DB}/.msg_service.db
-chown messaging:priv_message_read %{TZ_SYS_DB}/.msg_service.db-journal
-chown messaging:priv_message_read %{TZ_SYS_DATA}/msg-service
-chown messaging:priv_message_read %{TZ_SYS_DATA}/msg-service/msgdata
-chown messaging:priv_message_read %{TZ_SYS_DATA}/msg-service/smildata
-chown messaging:priv_message_read %{TZ_SYS_DATA}/msg-service/ipcdata
-chown messaging:priv_message_read %{TZ_SYS_DATA}/msg-service/msgdata/thumbnails
-
-chmod g+s %{TZ_SYS_DATA}/msg-service/msgdata
-chmod g+s %{TZ_SYS_DATA}/msg-service/smildata
-chmod g+s %{TZ_SYS_DATA}/msg-service/ipcdata
-chmod g+s %{TZ_SYS_DATA}/msg-service/msgdata/thumbnails
-
-chsmack -a "*" %{TZ_SYS_DB}/.msg_service.db
-chsmack -a "*" %{TZ_SYS_DB}/.msg_service.db-journal
-chsmack -a "System::Shared" %{TZ_SYS_DATA}/msg-service/
-chsmack -a "System::Shared" %{TZ_SYS_DATA}/msg-service/msgdata -t
-chsmack -a "System::Shared" %{TZ_SYS_DATA}/msg-service/smildata -t
-chsmack -a "System::Run" %{TZ_SYS_DATA}/msg-service/ipcdata -t
-chsmack -a "System::Shared" %{TZ_SYS_DATA}/msg-service/msgdata/thumbnails -t
+chmod 640 %{TZ_SYS_GLOBALUSER_DB}/.msg_service.db
+chmod 660 %{TZ_SYS_GLOBALUSER_DB}/.msg_service.db-journal
+
+mkdir -p -m 770 %{TZ_SYS_GLOBALUSER_DATA}/msg-service
+mkdir -p -m 750 %{TZ_SYS_GLOBALUSER_DATA}/msg-service/msgdata
+mkdir -p -m 750 %{TZ_SYS_GLOBALUSER_DATA}/msg-service/smildata
+mkdir -p -m 770 %{TZ_SYS_GLOBALUSER_DATA}/msg-service/ipcdata
+mkdir -p -m 750 %{TZ_SYS_GLOBALUSER_DATA}/msg-service/msgdata/thumbnails
+
+chown messaging:priv_message_read %{TZ_SYS_GLOBALUSER_DB}/.msg_service.db
+chown messaging:priv_message_read %{TZ_SYS_GLOBALUSER_DB}/.msg_service.db-journal
+chown messaging:priv_message_read %{TZ_SYS_GLOBALUSER_DATA}/msg-service
+chown messaging:priv_message_read %{TZ_SYS_GLOBALUSER_DATA}/msg-service/msgdata
+chown messaging:priv_message_read %{TZ_SYS_GLOBALUSER_DATA}/msg-service/smildata
+chown messaging:priv_message_read %{TZ_SYS_GLOBALUSER_DATA}/msg-service/ipcdata
+chown messaging:priv_message_read %{TZ_SYS_GLOBALUSER_DATA}/msg-service/msgdata/thumbnails
+
+chmod g+s %{TZ_SYS_GLOBALUSER_DATA}/msg-service/msgdata
+chmod g+s %{TZ_SYS_GLOBALUSER_DATA}/msg-service/smildata
+chmod g+s %{TZ_SYS_GLOBALUSER_DATA}/msg-service/ipcdata
+chmod g+s %{TZ_SYS_GLOBALUSER_DATA}/msg-service/msgdata/thumbnails
+
+chsmack -a "*" %{TZ_SYS_GLOBALUSER_DB}/.msg_service.db
+chsmack -a "*" %{TZ_SYS_GLOBALUSER_DB}/.msg_service.db-journal
+chsmack -a "System::Shared" %{TZ_SYS_GLOBALUSER_DATA}/msg-service/
+chsmack -a "System::Shared" %{TZ_SYS_GLOBALUSER_DATA}/msg-service/msgdata -t
+chsmack -a "System::Shared" %{TZ_SYS_GLOBALUSER_DATA}/msg-service/smildata -t
+chsmack -a "System::Run" %{TZ_SYS_GLOBALUSER_DATA}/msg-service/ipcdata -t
+chsmack -a "System::Shared" %{TZ_SYS_GLOBALUSER_DATA}/msg-service/msgdata/thumbnails -t
 
 #Multi group to ipcdata directory
-chmod o= %{TZ_SYS_DATA}/msg-service/ipcdata
-setfacl -m group:priv_message_write:rw %{TZ_SYS_DATA}/msg-service/ipcdata
+chmod o= %{TZ_SYS_GLOBALUSER_DATA}/msg-service/ipcdata
+setfacl -m group:priv_message_write:rw %{TZ_SYS_GLOBALUSER_DATA}/msg-service/ipcdata
 
 %post -n sms-plugin -p /sbin/ldconfig
 %post -n mms-plugin -p /sbin/ldconfig
@@ -272,7 +272,7 @@ setfacl -m group:priv_message_write:rw %{TZ_SYS_DATA}/msg-service/ipcdata
 %files tools
 %manifest msg-service-tools.manifest
 %license LICENSE.APLv2
-%config(noreplace) %{TZ_SYS_DB}/.msg_service.db*
+%config(noreplace) %{TZ_SYS_GLOBALUSER_DB}/.msg_service.db*
 %{_unitdir}/msg-server.service
 %{_unitdir}/multi-user.target.wants/msg-server.service
 %{_unitdir}/msg-server.socket