From 33714131a9387ebb89a1c3093d8e68c8a0669b63 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 12 Mar 2020 17:44:08 -0400 Subject: [PATCH] remove s390x gcc10 workaround (#1799408) The workaround added in 9a7edd4 (work around issue on s390x with gcc10 (#1799408), 2020-02-22) is no loner needed. The issue is fixed in gcc-10.0.1-0.9. --- git.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index ffe1557..0db6ff0 100644 --- a/git.spec +++ b/git.spec @@ -85,7 +85,7 @@ Name: git Version: 2.26.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -520,11 +520,6 @@ sed -i '/^git-p4/d' command-list.txt %endif # endif without p4 -# Work around issue on s390x with gcc10 (#1799408) -%if 0%{?fedora} >= 32 && %{_arch} == s390x -%global build_cflags %(echo %build_cflags | sed 's/-mtune=z13/-mtune=zEC12/') -%endif - # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. # Pipe to tee to aid confirmation/verification of settings. @@ -1058,6 +1053,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Mar 12 2020 Todd Zullinger - 2.26.0-0.2.rc1 +- remove s390x gcc10 workaround (#1799408) + * Tue Mar 10 2020 Todd Zullinger - 2.26.0-0.1.rc1 - update to 2.26.0-rc1 - adjust make test options