Move config files from /usr/etc to /etc/multimedia

Change-Id: I283f1b1a858221ea6e2622fb0f1b6d190421f930
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index c67b370..7bb0f38 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.71
+Version:    0.2.72
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0
@@ -54,12 +54,14 @@ cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} .
 cp po/* .
 
 %build
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE -DSYSCONFDIR=\\\"%{_sysconfdir}\\\""
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 mkdir -p m4
 %reconfigure --prefix=%{_prefix} --disable-static
 %__make %{?jobs:-j%jobs}
 
+
 #install .po files
 /usr/bin/msgfmt -o ar.mo ar.po
 /usr/bin/msgfmt -o az.mo az.po
@@ -214,9 +216,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_unitdir_user}/media-server-user.service
 install -m 644 %{SOURCE3} %{buildroot}%{_unitdir_user}/media-server-user.path
 ln -s ../media-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/media-server.service
 #ini file
-mkdir -p %{buildroot}/usr/etc
-cp -rf %{_builddir}/%{name}-%{version}/media_content_config.ini %{buildroot}/usr/etc/
-cp -rf %{_builddir}/%{name}-%{version}/media-server-plugin %{buildroot}/usr/etc/media-server-plugin
+mkdir -p %{buildroot}/etc/multimedia
+cp -rf %{_builddir}/%{name}-%{version}/media_content_config.ini %{buildroot}/etc/multimedia/media_content_config.ini
+cp -rf %{_builddir}/%{name}-%{version}/media-server-plugin %{buildroot}/etc/multimedia/media-server-plugin
 
 %post
 # setup dbupdate in user session
@@ -241,8 +243,8 @@ ln -sf ../media-server-user.path  %{_unitdir_user}/default.target.wants/
 %{_unitdir}/multi-user.target.wants/media-server.service
 %{_unitdir_user}/media-server-user.service
 %{_unitdir_user}/media-server-user.path
-/usr/etc/media_content_config.ini
-/usr/etc/media-server-plugin
+/etc/multimedia/media_content_config.ini
+/etc/multimedia/media-server-plugin
 %{_datadir}/locale/*/LC_MESSAGES/*
 %license LICENSE.APLv2.0
 

diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h
index c9cf386..00d46cf 100755 (executable)
--- a/src/common/include/media-common-types.h
+++ b/src/common/include/media-common-types.h
@@ -61,7 +61,7 @@
 
 #define MS_SOCK_NOT_ALLOCATE -1
 
-#define MS_INI_DEFAULT_PATH "/usr/etc/media_content_config.ini"
+#define MS_INI_DEFAULT_PATH SYSCONFDIR"/multimedia/media_content_config.ini"
 
 typedef enum {
        MS_STORAGE_INTERNAL = 0,        /**< The device's internal storage */

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index af601ca..7c4ce3a 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -27,7 +27,7 @@
 #include "media-common-dbg.h"
 #include <tzplatform_config.h>
 
-#define CONFIG_PATH "/usr/etc/media-server-plugin"
+#define CONFIG_PATH SYSCONFDIR"/multimedia/media-server-plugin"
 #define EXT ".so"
 #define EXT_LEN 3
 #define MSC_REGISTER_COUNT 300 /*For bundle commit*/