Change ini config path from /etc to /hal/etc

- Use the included ini for media-config package

Change-Id: I9b80e7a25bc79c25dec45f91477a62b403f63375

diff --git a/packaging/esplusplayer.spec b/packaging/esplusplayer.spec
index 63be9512ab94e8848e96180be9d54f0e3476f371..cac14c4bad975e0421b23e88f81e05c9b5e33858 100644 (file)
--- a/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@ -11,7 +11,7 @@
 Name:       esplusplayer
 Summary:    new multimedia streaming player
 Version:    1.3.7
-Release:    3
+Release:    4
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -146,8 +146,8 @@ export CFLAGS+=" -Wno-deprecated-declarations"
 export CXXFLAGS+=" -Wno-deprecated-declarations"
 
 %if %{with TIZEN_PUBLIC}
-export CFLAGS+=" -DTIZEN_FEATURE_PUBLIC"
-export CXXFLAGS+=" -DTIZEN_FEATURE_PUBLIC"
+export CFLAGS+=" -DTIZEN_FEATURE_PUBLIC -DSYSCONFDIR=\\\"%{_hal_sysconfdir}\\\""
+export CXXFLAGS+=" -DTIZEN_FEATURE_PUBLIC -DSYSCONFDIR=\\\"%{_hal_sysconfdir}\\\""
 %define TIZEN_PUBLIC ON
 %define USE_MIXER no
 %else
@@ -215,14 +215,18 @@ cp -rf tomato/tc/* %{buildroot}%{_tomatodir}/tc
 %endif
 
 %make_install
+%if %{without TIZEN_PUBLIC}
 mkdir -p %{buildroot}%TZ_SYS_RO_ETC/multimedia
+%endif
 #mkdir -p %{buildroot}%TZ_SYS_RW_APP/multimedia
 #mkdir -p %{buildroot}/opt
 #mkdir -p %{buildroot}/opt/usr
 #mkdir -p %{buildroot}/opt/usr/home
 #mkdir -p %{buildroot}/opt/usr/home/owner
 #mkdir -p %{buildroot}/opt/usr/home/owner/models
+%if %{without TIZEN_PUBLIC}
 cp -rf config/esplusplayer.ini %{buildroot}%TZ_SYS_RO_ETC/multimedia/esplusplayer.ini
+%endif
 
 %if 0%{?vd_gcov:1}
 mkdir -p %{buildroot}%{_datadir}/gcov/obj
@@ -239,7 +243,9 @@ find . \( -name '*.gcno' -o -name '*.cpp' -o -name '*.c' -o -name '*.hpp' -o -na
 %{_libdir}/libmixer.so
 %endif
 
+%if %{without TIZEN_PUBLIC}
 %TZ_SYS_RO_ETC/multimedia/esplusplayer.ini
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -254,8 +260,10 @@ find . \( -name '*.gcno' -o -name '*.cpp' -o -name '*.c' -o -name '*.hpp' -o -na
 %defattr(-,root,root,-)
 %manifest esplusplayer.manifest
 %license LICENSE.APLv2
+%if %{without TIZEN_PUBLIC}
 %TZ_SYS_RO_ETC/multimedia/esplusplayer.ini
 %attr(0775, owner,users) %TZ_SYS_RO_ETC/multimedia
+%endif
 
 %if 0%{?vd_gcov:1}
 %files gcov
@@ -271,4 +279,3 @@ find . \( -name '*.gcno' -o -name '*.cpp' -o -name '*.c' -o -name '*.hpp' -o -na
 %endif
 %defattr(-,root,root,-)
 %endif
-

diff --git a/src/plusplayer-core/src/plusplayer_cfg.cpp b/src/plusplayer-core/src/plusplayer_cfg.cpp
index 54241198645e2351ea3a53c426782231aa52674d..56ca95d269d90a24fba9637c1895c65ffb08ea5c 100644 (file)
--- a/src/plusplayer-core/src/plusplayer_cfg.cpp
+++ b/src/plusplayer-core/src/plusplayer_cfg.cpp
@@ -26,7 +26,11 @@ namespace esplusplayer_cfg {
 
 const char* GetIniPath() {
   const char* path =
+#ifdef TIZEN_FEATURE_PUBLIC
+    SYSCONFDIR"/multimedia/esplusplayer.ini";
+#else
     tzplatform_mkpath(TZ_SYS_RO_ETC, "multimedia/esplusplayer.ini");
+#endif
   assert(path);
   return path;
 }