Resolve libresourced build error issue with using tv_product macro 98/95598/4
authorYoungHun Kim <yh8004.kim@samsung.com>
Fri, 4 Nov 2016 03:22:24 +0000 (12:22 +0900)
committerYoungHun Kim <yh8004.kim@samsung.com>
Fri, 4 Nov 2016 04:32:43 +0000 (13:32 +0900)
Change-Id: I8e12a55f92a33891cab761aed4f8bbba19b26b3b

CMakeLists.txt
packaging/mused.spec

index d938b46..d651abe 100755 (executable)
@@ -47,10 +47,6 @@ IF("${ARCH}" STREQUAL "arm")
     ADD_DEFINITIONS("-DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
-IF(${MUSE_REGISTER_VIP})
-    ADD_DEFINITIONS("-DMUSE_REGISTER_VIP")
-ENDIF(${MUSE_REGISTER_VIP})
-
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 ADD_DEFINITIONS(-DTZ_SYS_DATA_PATH="${TZ_SYS_DATA}")
index c624c17..1326ca3 100644 (file)
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A Multimedia Daemon in Tizen Native API
-Version:    0.1.27
+Version:    0.1.28
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -25,7 +25,7 @@ BuildRequires: pkgconfig(cynara-creds-socket)
 BuildRequires: pkgconfig(cynara-session)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(gio-2.0)
-%if "%{?profile}" == "tv"
+%if "%{?TIZEN_PRODUCT_TV}" == "1"
 BuildRequires: pkgconfig(libresourced)
 %endif
 
@@ -59,10 +59,13 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE -D_GNU_SOURCE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE -D_GNU_SOURCE"
 %endif
 
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-
 %if "%{?profile}" == "tv"
 export CFLAGS+=" -DMUSE_NO_LOG"
+%endif
+
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+
+%if "%{?TIZEN_PRODUCT_TV}" == "1"
 export CFLAGS+=" -DMUSE_REGISTER_VIP"
 cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_REGISTER_VIP=1
 %else