Revert "Removed minor warning messages"

This reverts commit 7a0969dffdd81662e75b39e33d3aadefe31393f9.

Change-Id: Ifff75af0c9d6476ac96408983821dde9f9faed0c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 317345d..e483e65 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(settings-adid C)
+PROJECT(adid C)
 SET(PROJECT_NAME org.tizen.settings-adid)
 
 # Version control

diff --git a/packaging/org.tizen.settings-adid.spec b/packaging/adid.spec
similarity index 84%
rename from packaging/org.tizen.settings-adid.spec
rename to packaging/adid.spec
index 8bbfa7b..f29adc0 100644 (file)
--- a/packaging/org.tizen.settings-adid.spec
+++ b/packaging/adid.spec
@@ -2,7 +2,7 @@ Name:       org.tizen.settings-adid
 Summary:    Ad Id
 Version:    0.0.1
 Release:    1
-Group:      Network & Connectivity/Service
+Group:      comm
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires: pkgconfig(capi-appfw-application)
@@ -16,7 +16,6 @@ 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
@@ -24,7 +23,7 @@ Requires(post):   /sbin/ldconfig
 Requires(post):   /usr/bin/vconftool
 requires(postun): /sbin/ldconfig
 
-%define appdir /%{TZ_SYS_RO_APP}/%{name}
+%define appdir /usr/apps/org.tizen.settings-adid
 
 %description
 Tizen Ad-Id Setting Application
@@ -55,15 +54,15 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/
 
 ###### for package signing step ######
 %define tizen_sign 1
-%define tizen_sign_base %{TZ_SYS_RO_APP}/%{name}
+%define tizen_sign_base /usr/apps/org.tizen.settings-adid
 %define tizen_sign_level platform
 %define tizen_author_sign 1
 %define tizen_dist_sign 1
 
 %post
 /sbin/ldconfig
-mkdir -p /opt/usr/apps/%{name}/data
-chown -R 5000:5000 /opt/usr/apps/%{name}/data
+mkdir -p /opt/usr/apps/org.tizen.settings-adid/data
+chown -R 5000:5000 /opt/usr/apps/org.tizen.settings-adid/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
@@ -72,13 +71,13 @@ echo -e '\033[1m\033[36m ===== done ===== \033[0m'
 %postun -p /sbin/ldconfig
 
 %files
-%manifest %{name}.manifest
+%manifest org.tizen.settings-adid.manifest
 %defattr(-,root,root,-)
 /usr/share/license/%{name}
 %attr(-,inhouse,inhouse)
-%{TZ_SYS_RO_APP}/%{name}/*
+/usr/apps/org.tizen.settings-adid/*
 %defattr(-,root,root,-)
 %{appdir}/data/
-%{TZ_SYS_RO_PACKAGES}/%{name}.xml
+/usr/share/packages/org.tizen.settings-adid.xml
 %defattr(-,*,*,-)
 %dir

diff --git a/resources/edc/CMakeLists.txt b/resources/edc/CMakeLists.txt
index 2ca2a8d..cbdcd9c 100644 (file)
--- a/resources/edc/CMakeLists.txt
+++ b/resources/edc/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(settings-adid C CXX)
+PROJECT(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 9617a8d..58151b4 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-PROJECT(settings-adid C)
+PROJECT(adid C)
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
        SET(CMAKE_BUILD_TYPE "Release")