fix symbolic link 34/62034/1 accepted/tizen/mobile/20160314.105313 submit/tizen/20160314.041032
authorMyoungJune Park <mj2004.park@samsung.com>
Mon, 14 Mar 2016 04:09:02 +0000 (13:09 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Mon, 14 Mar 2016 04:09:02 +0000 (13:09 +0900)
Change-Id: I62e322195d1678ac93d1a396501e0307097d17a1

packaging/org.tizen.setting.spec
src/CMakeLists.txt

index 5f0116b00c004e33155d14d4ebf9b201881946aa..942e65fd5efe3681c72e2ea137387706d6fc59b8 100755 (executable)
@@ -233,17 +233,17 @@ GOPTION="-g 6514"
        #rm -f %{_sysconfdir}/localtime
        #ln -s %{_datadir}/zoneinfo/Asia/Seoul %{_sysconfdir}/localtime
 
-if [ -e /etc/localtime ]
-then
-       rm -f /etc/localtime
-       ln -s /usr/share/zoneinfo/Asia/Seoul /etc/localtime
-fi
+#if [ -e /etc/localtime ]
+#then
+#      rm -f /etc/localtime
+#      ln -s /usr/share/zoneinfo/Asia/Seoul /etc/localtime
+#fi
 
 #resetSecurity
        rm -rf {_prefix}/data/setting/set_info
 
 # for support shared menu icons
-ln -s %{RESDIR}/icons %{PREFIX}/shared/res/icons
+#ln -s %{RESDIR}/icons %{PREFIX}/shared/res/icons
 
 #APP_PATH_INFO=`%{PREFIX}/bin/setting_conf_util get_data_path`
 #echo "-------------------------------------------------------------> "$APP_PATH_INFO
index a440f810016f09485a058df72d0bddb4e74f6b07..a74a8633faed5e90b99bef91a3a48ea5d60b9d32 100755 (executable)
@@ -222,6 +222,7 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/${SETTING_PKG_NAME}.png DESTINATION /usr/share
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION /usr/apps/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION /usr/apps/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
 
+#INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION /usr/apps/${SETTING_PKG_NAME}/shared FILES_MATCHING PATTERN "*.png")
 
 # install file for help app
 #SET(HELPDATADIR_PH "/usr/apps/org.tizen.setting/shared/res")
@@ -240,6 +241,7 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/changeable/org.tizen.setting.xml DEST
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/mime.setting.xml DESTINATION /usr/share/mime/packages)
 
 
+
 #------------------------------------------------------------------
 #add setting-sfinder-plugin
 #ADD_SUBDIRECTORY(setting-sfinder-plugin)