change the installation path of media-vision-config.json

[cause]
 - In the path "/usr/share/config/" where capi-media-vision's json file is installed,
   other modules may install their files and may try to change the smack label of whole path.

[solve]
 - change the path to "/usr/share/capi-media-vision" of vision module's own

Change-Id: Iec767bd90226ec918e60f7518a11de6f815a85c5
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/mv_surveillance/surveillance/include/mv_surveillance_open.h b/mv_surveillance/surveillance/include/mv_surveillance_open.h
index e70c90b..a5241fa 100644 (file)
--- a/mv_surveillance/surveillance/include/mv_surveillance_open.h
+++ b/mv_surveillance/surveillance/include/mv_surveillance_open.h
@@ -162,7 +162,7 @@ int mv_surveillance_foreach_event_result_value_name_open(
 /**
  * @brief Gets result value.
  * @details See the output values names in the event types descriptions located
- *          in /usr/share/config/capi-media-vision/surveillance-event-types.txt.
+ *          in /usr/share/capi-media-vision/surveillance-event-types.txt.
  *
  * @since_tizen 3.0
  * @param [in] result           The event result

diff --git a/mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h b/mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h
index 16bd4fc..734a5cb 100644 (file)
--- a/mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h
+++ b/mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h
@@ -155,7 +155,7 @@ int mv_surveillance_foreach_event_result_value_name_lic(
 /**
  * @brief Gets result value.
  * @details See the output values names in the event types descriptions located
- *          in /usr/share/config/capi-media-vision/surveillance-event-types.txt.
+ *          in /usr/share/capi-media-vision/surveillance-event-types.txt.
  *
  * @since_tizen 3.0
  * @param [in] result           The handle to the event result

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index cd8360a..170b3bf 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -1,6 +1,6 @@
 Name:        capi-media-vision
 Summary:     Media Vision library for Tizen Native API
-Version:     0.3.19
+Version:     0.3.20
 Release:     0
 Group:       Multimedia/Framework
 License:     Apache-2.0 and BSD-2.0
@@ -58,8 +58,8 @@ export CFLAGS="$CFLAGS -DENABLE_NEON"
 export CXXFLAGS="$CXXFLAGS -DENABLE_NEON"
 %endif
 
-export CFLAGS+=" -DMV_CONFIG_PATH=\\\"%{TZ_SYS_RO_SHARE}/config/%{name}/\\\""
-export CXXFLAGS+=" -DMV_CONFIG_PATH=\\\"%{TZ_SYS_RO_SHARE}/config/%{name}/\\\""
+export CFLAGS+=" -DMV_CONFIG_PATH=\\\"%{TZ_SYS_RO_SHARE}/%{name}/\\\""
+export CXXFLAGS+=" -DMV_CONFIG_PATH=\\\"%{TZ_SYS_RO_SHARE}/%{name}/\\\""
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DTZ_SYS_BIN=%TZ_SYS_BIN
 
@@ -68,9 +68,9 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_datadir}/license/
-mkdir -p %{buildroot}%{_datadir}/config/%{name}
+mkdir -p %{buildroot}%{_datadir}/%{name}
 cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
-cp media-vision-config.json %{buildroot}%{_datadir}/config/%{name}/
+cp media-vision-config.json %{buildroot}%{_datadir}/%{name}/
 
 %make_install
 
@@ -80,7 +80,7 @@ cp media-vision-config.json %{buildroot}%{_datadir}/config/%{name}/
 %files
 %manifest capi-media-vision.manifest
 %{_datadir}/license/%{name}
-%{_datadir}/config/%{name}/media-vision-config.json
+%{_datadir}/%{name}/media-vision-config.json
 %{_libdir}/libcapi-media-vision.so.*
 %{_libdir}/libmv*.so