Revert the locale path

Change-Id: I74e137594e61e4b9ebc194adb814193a9f53da57
Signed-off-by: Hyuk Lee <hyuk0512.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d301a070a6e5fc802de857d486ab4cfb96bde86..5a819f9c6fc87bb35777a3f50f92c44ec6601ea0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,19 +1,17 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(ug-bluetooth-efl C)
+PROJECT(ug-setting-bluetooth-efl C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(PKG_NAME ug-bluetooth-efl)
-SET(APP_ROOT_DIR /usr/apps/${PKG_NAME})
-SET(LIB_DIR ${APP_ROOT_DIR}/lib/ug)
-SET(DATA_DIR ${APP_ROOT_DIR}/shared/trusted)
-SET(RES_DIR ${APP_ROOT_DIR}/res)
-SET(EXEC_DIR ${APP_ROOT_DIR}/bin)
+SET(EXEC_PREFIX "\${prefix}")
+SET(LIBDIR "\${prefix}/lib")
+SET(INCLUDEDIR "\${prefix}/include")
 SET(VERSION 0.1.0)
-SET(LOCALEDIR ${APP_ROOT_DIR}/shared/res/locale/)
-SET(EDJDIR ${RES_DIR}/edje/)
-SET(IMAGEDIR ${RES_DIR}/images/)
-SET(HELPDIR ${RES_DIR}/help/)
-SET(TABLEDIR ${RES_DIR}/tables/)
+SET(RESDIR "${PREFIX}/res")
+SET(LOCALEDIR "${RESDIR}/locale")
+SET(EDJDIR "${RESDIR}/edje/${PROJECT_NAME}")
+SET(IMAGEDIR "${RESDIR}/images/${PROJECT_NAME}")
+SET(HELPDIR "${RESDIR}/help/${PROJECT_NAME}")
+SET(TABLEDIR "${RESDIR}/tables/${PROJECT_NAME}")
 
 SET(SRCS
 src/ui/bt-main-ug.c
@@ -79,7 +77,7 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_DIR})
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ug-bluetooth-efl.png DESTINATION ${IMAGEDIR})
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
@@ -89,4 +87,4 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tables/WVGA/ DESTINATION ${TABLEDI
 
 
 ADD_SUBDIRECTORY(po)
-ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(data)
\ No newline at end of file

diff --git a/packaging/ug-bluetooth-efl.spec b/packaging/ug-bluetooth-efl.spec
index 692b22dd0c83e6f9d8879d7fda9a3716655b77b5..8bc3c47ee15052416948cf936ba915b6c1fd00fa 100644 (file)
--- a/packaging/ug-bluetooth-efl.spec
+++ b/packaging/ug-bluetooth-efl.spec
@@ -1,8 +1,6 @@
 %define _optdir        /opt
 %define _usrdir        /usr
-%define _appdir        %{_usrdir}/apps/ug-bluetooth-efl/
-%define _helpfile help_settings_bluetooth.xml
-%define _bindir %{_appdir}/bin/
+%define _ugdir %{_usrdir}/ug
 
 Name:       ug-bluetooth-efl
 Summary:    UI gadget about the bluetooth
@@ -59,17 +57,14 @@ export CFLAGS="$CFLAGS -DTIZEN_HID"
 %endif
 
 export LDFLAGS
-cmake . -DCMAKE_INSTALL_PREFIX=%{_appdir}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_ugdir}
 
 make %{?jobs:-j%jobs}
 
 %post
-mkdir -p %{_bindir}
-
-ln -sf /usr/apps/ug-bluetooth-efl/bin/ug-bluetooth-efl /usr/apps/ug-bluetooth-efl/bin/ug-bluetooth-efl-single
-ln -sf /usr/apps/ug-bluetooth-efl/lib/ug/libug-bluetooth-efl.so.0.1.0 /usr/apps/ug-bluetooth-efl/lib/ug/libug-bluetooth-efl-single.so
-#ln -sf /usr/bin/ug-client /usr/ug/bin/setting-bluetooth-efl
-#ln -sf /usr/bin/ug-client /usr/ug/bin/setting-bluetooth-efl-single
+mkdir -p /usr/ug/bin/
+ln -sf /usr/bin/ug-client /usr/ug/bin/setting-bluetooth-efl
+ln -sf /usr/bin/ug-client /usr/ug/bin/setting-bluetooth-efl-single
 
 %install
 rm -rf %{buildroot}
@@ -79,12 +74,12 @@ install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/ug-bluetooth-efl
 %files
 %manifest ug-bluetooth-efl.manifest
 %defattr(-,root,root,-)
-%{_appdir}/res/edje/*.edj
-%{_appdir}/shared/res/locale/*/LC_MESSAGES/ug-bluetooth-efl.mo
-%{_appdir}/res/images/*
-%{_appdir}/res/help/*
-%{_appdir}/lib/ug/libug-bluetooth-efl.so.0.1.0
-%{_appdir}/lib/ug/libug-bluetooth-efl.so
+%{_ugdir}/res/help/*
+%{_ugdir}/res/edje/ug-setting-bluetooth-efl/*.edj
+%{_ugdir}/res/locale/*/LC_MESSAGES/*
+%{_ugdir}/res/images/ug-setting-bluetooth-efl/*
+%{_ugdir}/lib/libug-setting-bluetooth-efl.so.0.1.0
+%{_ugdir}/lib/libug-setting-bluetooth-efl.so
 %ifarch i586
 %exclude %{_usrdir}/share/packages/ug-bluetooth-efl.xml
 %else
@@ -92,6 +87,6 @@ install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/ug-bluetooth-efl
 %endif
 %{_usrdir}/share/icons/default/small/ug-bluetooth-efl.png
 %{_datadir}/license/ug-bluetooth-efl
-%{_appdir}/res/tables/ug-bluetooth-efl_ChangeableColorTable.xml
-%{_appdir}/res/tables/ug-bluetooth-efl_FontInfoTable.xml
+%{_ugdir}/res/tables/ug-setting-bluetooth-efl/ug-bluetooth-efl_ChangeableColorTable.xml
+%{_ugdir}/res/tables/ug-setting-bluetooth-efl/ug-bluetooth-efl_FontInfoTable.xml