From 2453291d79e3601a1e852005cc59ce43cf34c6b4 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 28 May 2021 13:56:42 +0000
Subject: [PATCH 1/2] HOSTTYPE

OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=329
---
 bash.changes | 5 +++++
 bash.spec    | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bash.changes b/bash.changes
index 774904f8..1aafa0b9 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 28 13:53:55 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Use well defined HOSTTYPE, as well as OS, VENDOR, and MACHTYPE (boo#1186296)
+
 -------------------------------------------------------------------
 Wed May  5 14:59:54 UTC 2021 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/bash.spec b/bash.spec
index 562eb2b3..d15dc7b1 100644
--- a/bash.spec
+++ b/bash.spec
@@ -430,7 +430,8 @@ test ${rl1[2]} = ${rl2[2]} || exit 1
 %if 0%{?do_profiling}
   profilecflags=CFLAGS="$CFLAGS %cflags_profile_generate"
 %endif
-  make "$profilecflags" \
+  makeopts="Machine=%{_target_cpu} OS=linux VENDOR=suse MACHTYPE=%{_target_cpu}-suse-linux"
+  make $makeopts "$profilecflags" \
 	all printenv recho zecho xcase
   TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1
   > $SCREENLOG
@@ -444,9 +445,9 @@ test ${rl1[2]} = ${rl2[2]} || exit 1
   profilecflags=CFLAGS="$CFLAGS %cflags_profile_feedback -fprofile-correction"
   clean=clean
 %endif
-  make "$profilecflags" $clean all
-  make -C examples/loadables/
-  make documentation
+  make $makeopts "$profilecflags" $clean all
+  make $makeopts -C examples/loadables/
+  make $makeopts documentation
 
 %install
   %make_install

From b7172de4e928c61f8c5eeed1bf460f65a770cc1d Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 28 May 2021 14:18:58 +0000
Subject: [PATCH 2/2] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=330
---
 bash.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash.spec b/bash.spec
index d15dc7b1..d35a2a5c 100644
--- a/bash.spec
+++ b/bash.spec
@@ -91,7 +91,7 @@ Provides:       /bin/bash
 Provides:       /bin/sh
 %global         _sysconfdir /etc
 %global         _incdir     %{_includedir}
-%global         _ldldir     /%{_libdir}/bash
+%global         _ldldir     %{_libdir}/bash
 %global         _minsh      0
 
 %description