fix shared-res path, setting.cfg path

Change-Id: I5b82e2249428913f0135ae5eca8bb715320799bb

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 81fc4bff767379fcafe77842ff297556a54437bc..b85019be8e2435208f5038e76f53723a8e626d13 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -143,6 +143,8 @@ Group: Application Framework/Settings
 %build
 
 %define PREFIX    %{_prefix}/apps/org.tizen.setting
+%define OPTPREFIX /opt/usr/apps/org.tizen.setting
+%define OPTSHAREREFIX    /opt/usr/share/settings
 %define RESDIR    %{PREFIX}/res
 %define DATADIR    %{PREFIX}/data
 %define IMAGEDIR    %{RESDIR}/images
@@ -212,13 +214,15 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/default.target.wants
 %clean
 
 %post
-#create directory %{_prefix}/apps/org.tizen.setting.data
-if [ ! -d %{PREFIX} ]
+if [ ! -d %{OPTPREFIX} ]
 then
-    mkdir -p %{PREFIX}
+       echo "CREATE %{OPTPREFIX} DIR"
+    mkdir -p %{OPTPREFIX}
+       echo "CREATE %{DATADIR} DIR"
     mkdir -p %{DATADIR}
 fi
-chmod a+w %{PREFIX}/data
+chmod a+w %{OPTPREFIX}/data
+
 
 
 update-mime-database %{_prefix}/share/mime
@@ -227,12 +231,12 @@ update-mime-database %{_prefix}/share/mime
 GOPTION="-g 6514"
 
 #resetSound
-       DEFAULT_CALL_TONE="%{_datadir}/settings/Ringtones/ringtone_sdk.mp3"
-       DEFAULT_NOTI_TONE="%{_datadir}/settings/Alerts/General notification_sdk.wav"
+       DEFAULT_CALL_TONE="%{OPTSHAREREFIX}/Ringtones/ringtone_sdk.mp3"
+       DEFAULT_NOTI_TONE="%{OPTSHAREREFIX}/Alerts/General notification_sdk.wav"
 
 #resetImages
-       DEFAULT_HOME="%{_datadir}/settings/Wallpapers/Home_default.jpg"
-       DEFAULT_LOCK="%{_datadir}/settings/Wallpapers/Default.jpg"
+       DEFAULT_HOME="%{OPTSHAREREFIX}/Wallpapers/Home_default.jpg"
+       DEFAULT_LOCK="%{OPTSHAREREFIX}/Wallpapers/Default.jpg"
 
        rm -f %{_sysconfdir}/localtime
        ln -s %{_datadir}/zoneinfo/Asia/Seoul %{_sysconfdir}/localtime
@@ -285,17 +289,22 @@ mv %{_datadir}/packages/org.tizen.setting.xml.ref %{_datadir}/packages/org.tizen
 %attr(0755,root,root) %{PREFIX}/bin/setting_help_ringtone
 
 %{_libdir}/lib*.so.*
-
 %{_datadir}/packages/org.tizen.setting.xml
-
 %{_datadir}/icons/default/small/org.tizen.setting.png
-%{_datadir}/settings/*
+
+#%{_datadir}/settings/*
+
 %{PREFIX}/res/*
 %{_datadir}/mime/packages/*
 
+#/opt/usr/share/settings/*
+%{OPTSHAREREFIX}/*
+
 %{PREFIX}/shared/res/*
 %attr(-,app,app) %dir %{PREFIX}/shared
 
+#[  124s] error: File not found by glob: /usr/src/packages/BUILDROOT/org.tizen.setting-0.2.0-99.aarch64/usr/share/settings/*
+
 %{DATADIR}/test.db
 
 # new

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd633639bfa42b1ee3085ee625d1f9c1b535b576..22c56f7ea44658ddd97251ce21bdcdda022163f0 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -252,11 +252,11 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION /usr/apps/${SE
 #SET(HELPDATADIR_PH "/usr/apps/org.tizen.setting/shared/res")
 #INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/help DESTINATION ${HELPDATADIR_PH} PATTERN "*")
 
-# install media-data
+# install media-data ; should be at /opt/usr/share
 IF("${BUILD_ARCH}" STREQUAL "arm")
-       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /usr/share PATTERN "*")
+       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /opt/usr/share PATTERN "*")
 ELSE("${BUILD_ARCH}" STREQUAL "arm")
-       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /usr/share PATTERN "*")
+       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /opt/usr/share PATTERN "*")
 ENDIF("${BUILD_ARCH}" STREQUAL "arm")