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 c8c6044e13cf989ba8bc6f08ce87bc19b1e2aba7..d782461ced6f1ef8e4fa28d43d51c2f5bd96d226 100644 (file)
--- 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 2da9b4ae5a9bea98f1fa88c9cef6cdbfd3f464bd..a93b9622b32a05143d67ab19c03209f6819261fe 100644 (file)
--- 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 367e719178e64613dad8312554271ab4d518d1c0..074a9940a38a3208b3f9bccafcd822aaa7093b37 100644 (file)
--- 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 3bce2efb7052344fc63f0b99b9f320b49f5c313d..cd9353e090b182d14b9331ec1949991e0968c7f9 100644 (file)
--- 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 17168b571ce7ce04fac9321ebd8293109924560f..1eb5c5d0baeab6f443058f658c4042014cf57e26 100644 (file)
--- 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 3d111bb928dcb69b927d356c9a5cf15bcf84249d..3515942a6e8c30cc62a3f29b81f2ca0e4c352163 100644 (file)
--- 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 303170e0119915a46ba0ad6aad15987ff7be07f0..4ed9f7f1c58cd75041d4b6f964f31eb7ec91f5f2 100644 (file)
--- 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 531c394c3010be88a9c85f33d2d49d7c0b2a316c..0138f4b39b3d133fc2b98b4410992955a63d83e8 100644 (file)
--- 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 605c212a651bb2a55ddf3f4df20fb9c79fb88131..33c59f0c09ad81a0be56f8951feadc13ef1b6e95 100644 (file)
--- 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