From a05add60adc9b4758470334f0ded63f2bfcdf7e8c4220384399a822e314369ef Mon Sep 17 00:00:00 2001
From: Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
Date: Mon, 9 Dec 2024 10:50:09 +0000
Subject: [PATCH] Upgrade to 2.36

OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=234
---
 s390-tools.spec | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/s390-tools.spec b/s390-tools.spec
index 78ea644..e31cd97 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -378,13 +378,8 @@ tar -xzf %{SOURCE201}
 export OPT_FLAGS="%{optflags}"
 export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
 
-export CC=gcc-%{gcc_version}
-export CXX=g++-%{gcc_version}
-
-%if %{gcc_version} < 13
 export CC=gcc-13
 export CXX=g++-13
-%endif
 
 %make_build \
      ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
@@ -399,13 +394,8 @@ gcc-13 -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
 mkdir -p %{buildroot}/boot/zipl
 mkdir -p %{buildroot}%{_sysconfdir}/zkey/repository
 
-export CC=gcc-%{gcc_version}
-export CXX=g++-%{gcc_version}
-
-%if %{gcc_version} < 13
 export CC=gcc-13
 export CXX=g++-13
-%endif
 
 %make_install \
      ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
@@ -828,13 +818,8 @@ tar -xzf %{SOURCE201}
 export OPT_FLAGS="%{optflags}"
 export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
 
-export CC=gcc-%{gcc_version}
-export CXX=g++-%{gcc_version}
-
-%if %{gcc_version} < 13
 export CC=gcc-13
 export CXX=g++-13
-%endif
 
 %make_build \
      DISTRELEASE=%{release} \
@@ -844,13 +829,8 @@ export CXX=g++-13
 
 %install
 
-export CC=gcc-%{gcc_version}
-export CXX=g++-%{gcc_version}
-
-%if %{gcc_version} < 13
 export CC=gcc-13
 export CXX=g++-13
-%endif
 
 %make_install \
      DISTRELEASE=%{release} \