From 6164c2e0a1a3f2cb4d398822933eb9f61bf11dd25cd0aca3d6db08e5f37fade0 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Fri, 24 Feb 2017 15:55:45 +0000
Subject: [PATCH] Accepting request 460197 from openSUSE:Factory:zSystems

change behavior of automake on s390 to match other architectures

OBS-URL: https://build.opensuse.org/request/show/460197
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=55
---
 automake-SuSE.patch     | 32 +++++++++++++++++++++++++++++---
 automake-testsuite.spec |  2 +-
 automake.changes        |  5 +++++
 automake.spec           |  2 +-
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/automake-SuSE.patch b/automake-SuSE.patch
index 6fe4319..189cff1 100644
--- a/automake-SuSE.patch
+++ b/automake-SuSE.patch
@@ -4,8 +4,8 @@
 
 Index: lib/config.guess
 ===================================================================
---- lib/config.guess.orig	2015-02-10 12:01:47.557016290 +0100
-+++ lib/config.guess	2015-02-10 12:05:32.791670816 +0100
+--- lib/config.guess.orig
++++ lib/config.guess
 @@ -153,6 +153,16 @@ Linux|GNU|GNU/*)
  	;;
  esac
@@ -290,7 +290,8 @@ Index: lib/config.guess
 +	echo powerpcle-${VENDOR}-linux-${LIBC}
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      sh64*:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -447,3 +448,28 @@ Index: lib/config.guess
  	exit ;;
  esac
  
+Index: lib/config.sub
+===================================================================
+--- lib/config.sub.orig
++++ lib/config.sub
+@@ -1058,12 +1058,18 @@ case $basic_machine in
+ 	rtpc | rtpc-*)
+ 		basic_machine=romp-ibm
+ 		;;
+-	s390 | s390-*)
++	s390)
+ 		basic_machine=s390-ibm
+ 		;;
+-	s390x | s390x-*)
++	s390-*)
++		basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	s390x)
+ 		basic_machine=s390x-ibm
+ 		;;
++	s390x-*)
++		basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	sa29200)
+ 		basic_machine=a29k-amd
+ 		os=-udi
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index 4f26d20..38c7cd5 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package automake-testsuite
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/automake.changes b/automake.changes
index 85fe4b6..dc51c03 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 10 07:34:09 UTC 2017 - bg@suse.com
+
+- use vendor suse instead of IBM on s390x
+
 -------------------------------------------------------------------
 Sun Jun 26 19:13:10 UTC 2016 - mpluskal@suse.com
 
diff --git a/automake.spec b/automake.spec
index a168f63..4b4e083 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package automake
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed