sync with working project build-conf

Change-Id: Id02638eb9ddd5058a9e2e7148821d46801fd835b
Signed-off-by: JF Ding <jian-feng.ding@intel.com>

diff --git a/build.conf b/build.conf
index c489388..40d2bad 100644 (file)
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,3 @@
-%define _repository atom
-
 Patterntype: rpm-md comps
 Release: <CI_CNT>.<B_CNT>
 Support: build 
@@ -8,11 +6,19 @@ Support: rpmlint-mini rpmlint-tizen
 
 %ifarch %arm armv7l
 Substitute: mesa-devel pkgconfig(glesv20)
+Substitute: pkgconfig(egl)
 %else
 Substitute: mesa-devel pkgconfig(gles11) pkgconfig(gles20)
 Substitute: pkgconfig(glesv20) pkgconfig(gles20)
 %endif
 
+%if "%_repository" == "emulator"
+  Prefer: simulator-opengl-devel
+  #Support: emulator-macros
+  Optflags: i586 %{__global_cflags} -m32 -march=core2 -msse3 -mno-ssse3 -mfpmath=sse -mtune=generic -fasynchronous-unwind-tables -fno-omit-frame-pointer
+%endif
+
+
 # Tizen:Mobile
 FileProvides: /usr/sbin/groupadd pwdutils
 
@@ -26,7 +32,7 @@ Prefer: e17
 Prefer: e17-devel
 Prefer: pvr-bin-mdfld
 Prefer: pvr-bin-mdfld-devel
-Prefer: libtapi-devel
+
 
 
 %define _without_cairo_gl_backend 0
@@ -52,8 +58,8 @@ Target: armv7l-tizen-linux
 %ifarch %arm armv7l
 Hostarch: x86_64
 # cross build support for the build hosts
-Preinstall: qemu-linux-user
-Keep: qemu-linux-user
+Preinstall: qemu-linux-user-cross-arm
+Keep: qemu-linux-user-cross-arm
 %endif
 
 %ifarch armv7hl 
@@ -62,21 +68,16 @@ Runscripts: qemu-accel-armv7hl
 Preinstall: util-linux libmount libblkid libuuid
 %endif
 %ifarch armv7l 
-Preinstall: qemu-accel-armv7l
-Runscripts: qemu-accel-armv7l
-Preinstall: util-linux libmount libblkid libuuid
-%endif
-%ifarch armv7el
-Preinstall: qemu-accel-armv7el
-Runscripts: qemu-accel-armv7el
+Preinstall: qemu-accel-armv7l-cross-arm
+Runscripts: qemu-accel-armv7l-cross-arm
 Preinstall: util-linux libmount libblkid libuuid
 %endif
 
-ExportFilter: ^qemu-linux-user.*\.x86_64\.rpm$ . armv7el armv7l armv7hl
+ExportFilter: ^qemu-linux-user.*\.x86_64\.rpm$ . armv7l armv7hl
 
 ExportFilter: ^qemu-accel-armv7hl.*\.x86_64\.rpm$ .  armv7hl
 ExportFilter: ^qemu-accel-armv7l.*\.x86_64\.rpm$ .  armv7l
-ExportFilter: ^qemu-accel-armv7el.*\.x86_64\.rpm$ .  armv7el
+ExportFilter: \.armv7l\.rpm$ armv7l
 ExportFilter: \.x86_64\.rpm$ x86_64