From 10a5cb11141d5609131319376505499953ba9871 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 9 Nov 2021 14:29:27 -0500
Subject: [PATCH] import dotnet3.1-3.1.120-2.el8_5

---
 .dotnet3.1.metadata  |  2 +-
 .gitignore           |  2 +-
 SPECS/dotnet3.1.spec | 24 ++++++++++++++++--------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata
index cdba9c6..6c6f737 100644
--- a/.dotnet3.1.metadata
+++ b/.dotnet3.1.metadata
@@ -1 +1 @@
-f32e4c0d50bd5566b4f85a5bfa953158d7c636f3 SOURCES/dotnet-v3.1.119-SDK.tar.gz
+c0f6d5f50eb52c337450d0d71f7d50c7521a844c SOURCES/dotnet-v3.1.120-SDK.tar.gz
diff --git a/.gitignore b/.gitignore
index 8814cd4..654b4b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.119-SDK.tar.gz
+SOURCES/dotnet-v3.1.120-SDK.tar.gz
diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec
index 12bca8c..58a3fed 100644
--- a/SPECS/dotnet3.1.spec
+++ b/SPECS/dotnet3.1.spec
@@ -25,10 +25,10 @@
 %endif
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%global host_version 3.1.19
-%global runtime_version 3.1.19
+%global host_version 3.1.20
+%global runtime_version 3.1.20
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.119
+%global sdk_version 3.1.120
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
 %global host_rpm_version %{host_version}
@@ -333,28 +333,28 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
 %endif
 
 # Fix bad hardcoded path in build
-sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
 
 # Disable warnings
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props
 
 %patch1 -p1
 
-pushd src/corefx.*
+pushd src/dotnet-corefx.*
 %patch100 -p1
 %patch103 -p1
 popd
 
-pushd src/coreclr.*
+pushd src/dotnet-coreclr.*
 %patch200 -p1
 #%%patch201 -p1
 popd
 
-pushd src/core-setup.*
+pushd src/dotnet-core-setup.*
 %patch300 -p1
 popd
 
-pushd src/cli.*
+pushd src/dotnet-cli.*
 %patch500 -p1
 popd
 
@@ -501,6 +501,14 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
 %{_libdir}/dotnet/source-built-artifacts
 
 %changelog
+* Wed Oct 15 2021 Omair Majid <omajid@redhat.com> - 3.1.120-2
+- Rebuild to fix version
+- Resolves: RHBZ#2011820
+
+* Wed Oct 13 2021 Omair Majid <omajid@redhat.com> - 3.1.120-1
+- Update to .NET SDK 3.1.120 and Runtime 3.1.20
+- Resolves: RHBZ#2011820
+
 * Thu Sep 23 2021 Omair Majid <omajid@redhat.com> - 3.1.119-2
 - Update to .NET SDK 3.1.119 and Runtime 3.1.19
 - Resolves: RHBZ#2000313