fix build break on common 20/65420/1 accepted/tizen/common/20160411.125957 accepted/tizen/ivi/20160411.051415 accepted/tizen/mobile/20160411.051529 accepted/tizen/tv/20160411.051430 accepted/tizen/wearable/20160411.051503 submit/tizen/20160411.023255
authorKyeonghun Lee <kh9090.lee@samsung.com>
Mon, 11 Apr 2016 02:19:38 +0000 (11:19 +0900)
committerKyeonghun Lee <kh9090.lee@samsung.com>
Mon, 11 Apr 2016 02:19:38 +0000 (11:19 +0900)
Change-Id: Ic559d2293f07fcd4e3b5198443438c3052625d45
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
CMakeLists.txt
packaging/msg-service.spec

index 547a940..53ec500 100755 (executable)
@@ -57,7 +57,7 @@ ELSE(_FEATURE_SMS_CDMA)
 ADD_SUBDIRECTORY(plugin/sms_plugin)
 ENDIF(_FEATURE_SMS_CDMA)
 ADD_SUBDIRECTORY(plugin/mms_plugin)
-IF(NOT _MSG_WEARABLE_PROFILE)
+IF(_MSG_MOBILE_PROFILE)
 ADD_SUBDIRECTORY(manager)
 ENDIF()
 
index cf02ffd..bb9f740 100755 (executable)
@@ -53,6 +53,9 @@ BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(tapi)
 BuildRequires: pkgconfig(vconf)
 %if "%{?profile}" != "wearable"
+BuildRequires: pkgconfig(contacts-service2)
+%endif
+%if "%{?profile}" == "mobile"
 BuildRequires: pkgconfig(appcore-agent)
 BuildRequires: pkgconfig(badge)
 BuildRequires: pkgconfig(callmgr_client)
@@ -60,7 +63,6 @@ BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-appfw-package-manager)
 BuildRequires: pkgconfig(capi-media-player)
 BuildRequires: pkgconfig(capi-media-sound-manager)
-BuildRequires: pkgconfig(contacts-service2)
 BuildRequires: pkgconfig(feedback)
 BuildRequires: pkgconfig(notification)
 %endif
@@ -123,7 +125,7 @@ Group:          Applications
 %description -n msg-manager
 Description: Message manager application
 
-%if "%{?profile}" != "wearable"
+%if "%{?profile}" == "mobile"
 %define APP_PKGNAME    org.tizen.msg-manager
 %define APP_PREFIX     %{TZ_SYS_RO_APP}/%{APP_PKGNAME}
 %define APP_BINDIR     %{APP_PREFIX}/bin
@@ -136,7 +138,7 @@ Description: Message manager application
 %build
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
                -DLIB_INSTALL_DIR=%{_libdir} \
-%if "%{?profile}" != "wearable"
+%if "%{?profile}" == "mobile"
                -DAPP_MANIFESTDIR=%{APP_MANIFESTDIR}   \
                -DAPP_BINDIR=%{APP_BINDIR}   \
 %endif
@@ -154,6 +156,11 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %else
 -D_MSG_WEARABLE_PROFILE:BOOL=OFF \
 %endif
+%if "%{?profile}" == "mobile"
+-D_MSG_MOBILE_PROFILE:BOOL=ON \
+%else
+-D_MSG_MOBILE_PROFILE:BOOL=OFF \
+%endif
 
 make %{?jobs:-j%jobs}
 
@@ -255,7 +262,7 @@ chsmack -a "System::Shared" %{TZ_SYS_DATA}/msg-service/msgdata/thumbnails -t
 %license LICENSE.APLv2
 %{_libdir}/libmsg_mms_plugin.so
 
-%if "%{?profile}" != "wearable"
+%if "%{?profile}" == "mobile"
 %files -n msg-manager
 %manifest msg-manager.manifest
 %license LICENSE.APLv2