From 7a0969dffdd81662e75b39e33d3aadefe31393f9 Mon Sep 17 00:00:00 2001 From: Younho Park Date: Wed, 2 Nov 2016 11:48:13 +0900 Subject: [PATCH] Removed minor warning messages Change-Id: Ib6ac9549fa1ab651bf899fb9666a229928194f64 Signed-off-by: Younho Park --- CMakeLists.txt | 2 +- packaging/{adid.spec => org.tizen.settings-adid.spec} | 17 +++++++++-------- resources/edc/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) rename packaging/{adid.spec => org.tizen.settings-adid.spec} (84%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e483e65..317345d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(adid C) +PROJECT(settings-adid C) SET(PROJECT_NAME org.tizen.settings-adid) # Version control diff --git a/packaging/adid.spec b/packaging/org.tizen.settings-adid.spec similarity index 84% rename from packaging/adid.spec rename to packaging/org.tizen.settings-adid.spec index f29adc0..8bbfa7b 100644 --- a/packaging/adid.spec +++ b/packaging/org.tizen.settings-adid.spec @@ -2,7 +2,7 @@ Name: org.tizen.settings-adid Summary: Ad Id Version: 0.0.1 Release: 1 -Group: comm +Group: Network & Connectivity/Service License: Apache-2.0 Source0: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(capi-appfw-application) @@ -16,6 +16,7 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(capi-system-system-settings) +BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: edje-bin BuildRequires: cmake BuildRequires: gettext-tools @@ -23,7 +24,7 @@ Requires(post): /sbin/ldconfig Requires(post): /usr/bin/vconftool requires(postun): /sbin/ldconfig -%define appdir /usr/apps/org.tizen.settings-adid +%define appdir /%{TZ_SYS_RO_APP}/%{name} %description Tizen Ad-Id Setting Application @@ -54,15 +55,15 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/ ###### for package signing step ###### %define tizen_sign 1 -%define tizen_sign_base /usr/apps/org.tizen.settings-adid +%define tizen_sign_base %{TZ_SYS_RO_APP}/%{name} %define tizen_sign_level platform %define tizen_author_sign 1 %define tizen_dist_sign 1 %post /sbin/ldconfig -mkdir -p /opt/usr/apps/org.tizen.settings-adid/data -chown -R 5000:5000 /opt/usr/apps/org.tizen.settings-adid/data +mkdir -p /opt/usr/apps/%{name}/data +chown -R 5000:5000 /opt/usr/apps/%{name}/data echo -e '\033[1m\033[36m ===== Import to package DB using tpk-backend ===== \033[0m' echo 'tpk-backend -y %{name} --preload' tpk-backend -y %{name} --preload @@ -71,13 +72,13 @@ echo -e '\033[1m\033[36m ===== done ===== \033[0m' %postun -p /sbin/ldconfig %files -%manifest org.tizen.settings-adid.manifest +%manifest %{name}.manifest %defattr(-,root,root,-) /usr/share/license/%{name} %attr(-,inhouse,inhouse) -/usr/apps/org.tizen.settings-adid/* +%{TZ_SYS_RO_APP}/%{name}/* %defattr(-,root,root,-) %{appdir}/data/ -/usr/share/packages/org.tizen.settings-adid.xml +%{TZ_SYS_RO_PACKAGES}/%{name}.xml %defattr(-,*,*,-) %dir diff --git a/resources/edc/CMakeLists.txt b/resources/edc/CMakeLists.txt index cbdcd9c..2ca2a8d 100644 --- a/resources/edc/CMakeLists.txt +++ b/resources/edc/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(adid C CXX) +PROJECT(settings-adid C CXX) ADD_CUSTOM_TARGET(adid.edj COMMAND edje_cc -no-save -id ${CMAKE_CURRENT_SOURCE_DIR}/../data/images diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 58151b4..9617a8d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(adid C) +PROJECT(settings-adid C) IF("${CMAKE_BUILD_TYPE}" STREQUAL "") SET(CMAKE_BUILD_TYPE "Release") -- 2.7.4