update ivi build.conf based on latest repo

http://download.tizen.org/releases/daily/tizen/ivi/ivi/tizen_20131220.1/

Change-Id: Ibc101bfc59b673c5223b1c3462869965a8ad5fe0
Signed-off-by: Yigang Wen <yigangx.wen@intel.com>

diff --git a/Tizen:IVI:Release.build.conf b/Tizen:IVI:Release.build.conf
index 216a8fa39bb7fadd21e10738028608c56c6166df..11cea418f719ce4e386c78e23128aa48322f5e39 100644 (file)
--- a/Tizen:IVI:Release.build.conf
+++ b/Tizen:IVI:Release.build.conf
@@ -1,3 +1,5 @@
+%define _repository standard
+
 Patterntype: rpm-md comps
 Release: <CI_CNT>.<B_CNT>
 Support: build 
@@ -15,6 +17,19 @@ Prefer: nfc-manager-neard
 Prefer: nfc-manager-neard-devel
 Prefer: libtapi-devel
 
+#Added for emulator-yagl conflict (does not solve emulators needs)
+Prefer: mesa-libGLESv2
+Prefer: libwayland-egl
+Prefer: libgbm
+Prefer: mesa-libGL
+Prefer: mesa-libEGL
+
+#This solves emulators needs
+%if "%_repository" == "emulator"
+  Prefer: simulator-opengl-devel
+  Prefer: emulator-yagl
+%endif
+
 %define gcc_version 48
 
 %define _with_ivi 1
@@ -28,6 +43,9 @@ Prefer: libtapi-devel
 %define _with_bluetooth_frwk_libnotification 1
 %define _with_audio_session_manager 1
 %define _with_audio_session_manager_with_murphy 1
+%define _with_dlog_to_systemd_journal 1
+%define _with_wrt_option_eds 1
+%define _with_x 1
 
 
 # mesa
@@ -171,10 +189,12 @@ Macros:
 %_with_bluetooth_frwk_libnotification 1
 %_with_audio_session_manager 1
 %_with_audio_session_manager_with_murphy 1
+%_with_dlog_to_systemd_journal 1
+%_with_wrt_option_eds 1
+%_with_x 1
 
 %tizen_version 3.0
 %tizen 3.0
 
 %vendor tizen
 %_vendor tizen
-