diff options
author | kj7.sung <kj7.sung@samsung.com> | 2017-08-04 10:40:46 +0900 |
---|---|---|
committer | kj7.sung <kj7.sung@samsung.com> | 2017-08-04 10:41:00 +0900 |
commit | aab1fe5fd806add2d119a32ebc6f4cda42d35b55 (patch) | |
tree | a8c9ca686cd99c0de155f7b00717ce29a3b4ffbb | |
parent | 04c1269363ed21c90bde00586d14e15f0096e2a7 (diff) | |
download | lbs-setting-aab1fe5fd806add2d119a32ebc6f4cda42d35b55.tar.gz lbs-setting-aab1fe5fd806add2d119a32ebc6f4cda42d35b55.tar.bz2 lbs-setting-aab1fe5fd806add2d119a32ebc6f4cda42d35b55.zip |
Change package name to fix mobile build errorsubmit/tizen_4.0/20170828.100009submit/tizen/20170804.015503accepted/tizen/unified/20170804.132947accepted/tizen/4.0/unified/20170828.223153
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
Change-Id: I92e62a4ce03c063b14d5bc79ac2996f43160e96a
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | org.tizen.setting-location-wearable.manifest (renamed from org.tizen.setting-location.manifest) | 0 | ||||
-rw-r--r-- | org.tizen.setting-location-wearable.xml (renamed from org.tizen.setting-location.xml) | 4 | ||||
-rw-r--r-- | packaging/org.tizen.setting-location-wearable.spec (renamed from packaging/org.tizen.lbs_setting.spec) | 16 | ||||
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/lbs-setting-common.h | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba08b8d..6459b49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(setting-location C) -SET(PROJECT_NAME org.tizen.setting-location) -SET(LOCALE_DOMAIN_NAME setting-location) +PROJECT(setting-location-wearable C) +SET(PROJECT_NAME org.tizen.setting-location-wearable) +SET(LOCALE_DOMAIN_NAME setting-location-wearable) # Version control SET(VERSION_MAJOR 0) @@ -75,7 +75,7 @@ ADD_DEFINITIONS("-DLOCALE_DOMAIN_NAME=\"${LOCALE_DOMAIN_NAME}\"") INSTALL(DIRECTORY DESTINATION ${DATADIR}) # install smack rule file -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resources/data/xml/ DESTINATION /usr/apps/org.tizen.setting-location/res FILES_MATCHING PATTERN "*.xml") +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resources/data/xml/ DESTINATION /usr/apps/org.tizen.setting-location-wearable/res FILES_MATCHING PATTERN "*.xml") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resources/data/images/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.png") ADD_SUBDIRECTORY(src) diff --git a/org.tizen.setting-location.manifest b/org.tizen.setting-location-wearable.manifest index a76fdba..a76fdba 100644 --- a/org.tizen.setting-location.manifest +++ b/org.tizen.setting-location-wearable.manifest diff --git a/org.tizen.setting-location.xml b/org.tizen.setting-location-wearable.xml index aca993d..7fa6e33 100644 --- a/org.tizen.setting-location.xml +++ b/org.tizen.setting-location-wearable.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.setting-location" api-version="3.0" version="1.1.4" install-location="internal-only"> +<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.setting-location-wearable" api-version="3.0" version="1.1.4" install-location="internal-only"> <label>Location</label> <author email="kj7.sung@samsung.com" href="www.samsung.com">Kyoungjun Sung</author> <author email="cbible.kim@samsung.com" href="www.samsung.com">Seechan Kim</author> @@ -14,7 +14,7 @@ <privilege>http://tizen.org/privilege/haptic</privilege> <privilege>http://tizen.org/privilege/appmanager.launch</privilege> </privileges> - <ui-application appid="org.tizen.setting-location" exec="/usr/apps/org.tizen.setting-location/bin/setting-location" nodisplay="true" multiple="false" type="capp" taskmanage="false" launch_mode="caller"> + <ui-application appid="org.tizen.setting-location-wearable" exec="/usr/apps/org.tizen.setting-location-wearable/bin/setting-location-wearable" nodisplay="true" multiple="false" type="capp" taskmanage="false" launch_mode="caller"> <label>Location setting</label> <app-control> <operation name="http://tizen.org/appcontrol/operation/configure/location"/> diff --git a/packaging/org.tizen.lbs_setting.spec b/packaging/org.tizen.setting-location-wearable.spec index 7b961ee..04c0d0d 100644 --- a/packaging/org.tizen.lbs_setting.spec +++ b/packaging/org.tizen.setting-location-wearable.spec @@ -1,7 +1,7 @@ -%define appdir /usr/apps/org.tizen.setting-location +%define appdir /usr/apps/org.tizen.setting-location-wearable -Name: org.tizen.setting-location -Summary: location setting +Name: org.tizen.setting-location-wearable +Summary: location setting for wearable Version: 1.1.4 Release: 1 Group: Applications/Location @@ -39,8 +39,8 @@ location setting. %setup -q %build -%define PREFIX "/usr/apps/org.tizen.setting-location" -%define RW_PREFIX "/opt/usr/apps/org.tizen.setting-location" +%define PREFIX "/usr/apps/org.tizen.setting-location-wearable" +%define RW_PREFIX "/opt/usr/apps/org.tizen.setting-location-wearable" cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_RW_PREFIX=%{RW_PREFIX} \ @@ -57,14 +57,14 @@ rm -rf %{buildroot} /sbin/ldconfig mkdir -p /usr/ug/bin/ mkdir -p /usr/ug/res/locale/ -ln -sf /usr/bin/ug-client /usr/ug/bin/setting-location-efl +ln -sf /usr/bin/ug-client /usr/ug/bin/setting-location-wearable-efl %postun -p /sbin/ldconfig %files -%manifest org.tizen.setting-location.manifest +%manifest org.tizen.setting-location-wearable.manifest %license LICENSE %defattr(-,root,root,-) %{appdir}/* -/usr/share/packages/org.tizen.setting-location.xml +/usr/share/packages/org.tizen.setting-location-wearable.xml diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d958ae6..cc82fb5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -67,7 +67,7 @@ message(${EXT_LIBS_LDFLAGS}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) # install manifest file & icon -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.setting-location.xml DESTINATION /usr/share/packages) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.setting-location-wearable.xml DESTINATION /usr/share/packages) # install application HOME directory INSTALL(DIRECTORY DESTINATION ${DATADIR}) diff --git a/src/lbs-setting-common.h b/src/lbs-setting-common.h index a15578e..57dde78 100644 --- a/src/lbs-setting-common.h +++ b/src/lbs-setting-common.h @@ -36,7 +36,7 @@ extern "C" { #include <locations.h> #if !defined(LBS_SETTING_PKG) -#define LBS_SETTING_PKG "org.tizen.setting-location" +#define LBS_SETTING_PKG "org.tizen.setting-location-wearable" #endif #define DOMAIN_NAME LOCALE_DOMAIN_NAME |