Cleanup the build script

Change-Id: I9362c565e44871dc8e7268e2691dcc35767a39ca
Signed-off-by: Mu-Woong <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe31910..fa02998 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,13 +37,6 @@ ENDIF("${PROFILE}" STREQUAL "tv")
 
 MESSAGE("Sources: ${SRCS}")
 
-# Target vs Emulator
-IF("${ARCH}" STREQUAL "arm")
-       ADD_DEFINITIONS("-D_TARGET")
-ELSE("${ARCH}" STREQUAL "arm")
-       ADD_DEFINITIONS("-D_EMULATOR")
-ENDIF("${ARCH}" STREQUAL "arm")
-
 # Common Options
 INCLUDE(FindPkgConfig)
 INCLUDE_DIRECTORIES(

diff --git a/packaging/device-context-provider.spec b/packaging/device-context-provider.spec
index 6307e40..f7bb38c 100644 (file)
--- a/packaging/device-context-provider.spec
+++ b/packaging/device-context-provider.spec
@@ -1,11 +1,13 @@
 Name:       device-context-provider
 Summary:    Device Context Provider
-Version:    0.4.3
+Version:    0.5.0
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 
+%define BUILD_PROFILE %{?profile}%{!?profile:%{?tizen_profile_name}}
+
 BuildRequires: cmake
 BuildRequires: pkgconfig(context-common)
 BuildRequires: pkgconfig(vconf)
@@ -17,25 +19,19 @@ BuildRequires: pkgconfig(capi-network-bluetooth)
 BuildRequires: pkgconfig(capi-network-wifi)
 BuildRequires: pkgconfig(motion)
 
-%if "%{?tizen_profile_name}" == "mobile"
+%if "%{?BUILD_PROFILE}" == "mobile"
 BuildRequires: pkgconfig(capi-telephony)
 BuildRequires: pkgconfig(tapi)
 BuildRequires: pkgconfig(msg-service)
 BuildRequires: pkgconfig(capi-messaging-email)
 %endif
 
-%if "%{?tizen_profile_name}" == "wearable"
+%if "%{?BUILD_PROFILE}" == "wearable"
 BuildRequires: pkgconfig(capi-telephony)
 BuildRequires: pkgconfig(tapi)
 BuildRequires: pkgconfig(msg-service)
 %endif
 
-%ifarch %{arm}
-%define ARCH arm
-%else
-%define ARCH i586
-%endif
-
 %description
 Device Context Provider
 
@@ -55,12 +51,11 @@ export CXXFLAGS+=" -std=c++0x"
 export   CFLAGS+=" -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-strict-aliasing -fno-unroll-loops -fsigned-char -fstrict-overflow -fno-common"
 export CXXFLAGS+=" -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-strict-aliasing -fno-unroll-loops -fsigned-char -fstrict-overflow"
 
-%define BINTYPE engineer
 export   CFLAGS+=" -DTIZEN_ENGINEER_MODE"
 export CXXFLAGS+=" -DTIZEN_ENGINEER_MODE"
 export   FFLAGS+=" -DTIZEN_ENGINEER_MODE"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=%{ARCH} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?tizen_profile_name} -DBINTYPE=%{BINTYPE}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?BUILD_PROFILE}
 make %{?jobs:-j%jobs}
 
 %install