From: Li Jinjing <jinjingx.li@intel.com>
Date: Tue, 10 Feb 2015 07:31:32 +0000 (+0800)
Subject: Update build-config for common branch from OBS
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=794d64fb759fb17855e93f3aafbe9f7c8c843276;p=scm%2Fmeta%2Fbuild-config.git

Update build-config for common branch from OBS

Change-Id: I820293c226dbb5fc3db22bc60edc7820391aa0be
Signed-off-by: Li Jinjing <jinjingx.li@intel.com>
---

diff --git a/build-arm-wayland.conf b/build-arm-wayland.conf
index c8c6044..d782461 100644
--- a/build-arm-wayland.conf
+++ b/build-arm-wayland.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
diff --git a/build-arm-x11.conf b/build-arm-x11.conf
index 2da9b4a..a93b962 100644
--- a/build-arm-x11.conf
+++ b/build-arm-x11.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
diff --git a/build-arm64-wayland.conf b/build-arm64-wayland.conf
index 367e719..074a994 100644
--- a/build-arm64-wayland.conf
+++ b/build-arm64-wayland.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
diff --git a/build-arm64-x11.conf b/build-arm64-x11.conf
index 3bce2ef..cd9353e 100644
--- a/build-arm64-x11.conf
+++ b/build-arm64-x11.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
diff --git a/build-emulator32-wayland.conf b/build-emulator32-wayland.conf
index 17168b5..1eb5c5d 100644
--- a/build-emulator32-wayland.conf
+++ b/build-emulator32-wayland.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
diff --git a/build-ia32-wayland.conf b/build-ia32-wayland.conf
index 3d111bb..3515942 100644
--- a/build-ia32-wayland.conf
+++ b/build-ia32-wayland.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
diff --git a/build-ia32-x11.conf b/build-ia32-x11.conf
index 303170e..4ed9f7f 100644
--- a/build-ia32-x11.conf
+++ b/build-ia32-x11.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
diff --git a/build-x86_64-wayland.conf b/build-x86_64-wayland.conf
index 531c394..0138f4b 100644
--- a/build-x86_64-wayland.conf
+++ b/build-x86_64-wayland.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
diff --git a/build-x86_64-x11.conf b/build-x86_64-x11.conf
index 605c212..33c59f0 100644
--- a/build-x86_64-x11.conf
+++ b/build-x86_64-x11.conf
@@ -34,6 +34,13 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
+%if "%_repository" == "x86_64-wayland" || "%_repository" == "x86_64-x11" 
+%ifarch x86_64
+Support: glibc-32bit
+%endif
+%endif
+
+
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils