From 80ef30b70194c331f9f328a40d831dbd7bbfc8d4 Mon Sep 17 00:00:00 2001 From: Prakash Date: Fri, 4 Mar 2016 10:49:55 +0530 Subject: [PATCH] Modify XML installation path Change-Id: Idb9fd2fc38b7679b5c536c43973134d845b61ae7 Signed-off-by: Prakash --- CMakeLists.txt | 2 +- music-chooser/CMakeLists.txt | 2 +- packaging/org.tizen.music-player.spec | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c14652e..0e109e2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,7 +323,7 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/shared/res/shared_images DESTINATION ${SHA INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/changeable_GUI DESTINATION ${SHAREDDIR}/res) #install xml file -INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKG_NAME}.xml DESTINATION ${SHARE_DIR}/packages) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKG_NAME}.xml DESTINATION ${SHARE_DIR}) # Share APP mo files with music chooser SET(MC_MUSIC_PROJECT_NAME org.tizen.music-chooser) diff --git a/music-chooser/CMakeLists.txt b/music-chooser/CMakeLists.txt index fcca492..67c183f 100755 --- a/music-chooser/CMakeLists.txt +++ b/music-chooser/CMakeLists.txt @@ -81,6 +81,6 @@ ADD_DEPENDENCIES(${PROJECT_NAME} music-chooser.edj) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) INSTALL(DIRECTORY DESTINATION ${DATADIR}) INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edje/layout/music-chooser.edj DESTINATION ${MC_PREFIX}/res/edje) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.music-chooser.xml DESTINATION ${SHARE_DIR}/packages) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.music-chooser.xml DESTINATION ${SHARE_DIR}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/music-chooser.png DESTINATION ${CMAKE_DESKTOP_ICON_DIR}) diff --git a/packaging/org.tizen.music-player.spec b/packaging/org.tizen.music-player.spec index 86fc9f1..1e2255b 100755 --- a/packaging/org.tizen.music-player.spec +++ b/packaging/org.tizen.music-player.spec @@ -96,7 +96,7 @@ Description: music-chooser chooser %prep %setup -q -%define SHARE_DIR %{TZ_SYS_SHARE} +%define SHARE_DIR %{TZ_SYS_RO_PACKAGES} %define INSTALL_DIR %{TZ_SYS_RO_APP} %define PKG_NAME %{name} @@ -111,7 +111,6 @@ Description: music-chooser chooser %define SP_DATA_PREFIX %{INSTALL_DIR}/%{SP_PKG_NAME} %define _app_icon_dir %{TZ_SYS_RO_ICONS}/default/small/ -%define _app_share_packages_dir %{TZ_SYS_RO_PACKAGES} %define _app_license_dir %{TZ_SYS_SHARE}/license %build @@ -176,7 +175,7 @@ fi %post %files %manifest %{name}.manifest -%{_app_share_packages_dir}/%{name}.xml +%{SHARE_DIR}/%{name}.xml %{_app_icon_dir}/%{name}.png %{_app_icon_dir}/preview_music_4x2.png %{PREFIX}/bin/* @@ -194,7 +193,7 @@ fi %files -n org.tizen.music-chooser %manifest org.tizen.music-chooser.manifest -%{SHARE_DIR}/packages/org.tizen.music-chooser.xml +%{SHARE_DIR}/org.tizen.music-chooser.xml %{MC_PREFIX}/res/locale/*/LC_MESSAGES/*.mo %defattr(-,root,root,-) %{MC_PREFIX}/bin/* -- 2.7.4