From 542de2b7c6ef4633a06d3f76054626d2922d9a3f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 10 Mar 2022 09:45:45 -0500
Subject: [PATCH] import dotnet3.1-3.1.417-1.el8_5

---
 .dotnet3.1.metadata  |  2 +-
 .gitignore           |  2 +-
 SPECS/dotnet3.1.spec | 26 +++++++++++++++-----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata
index d5151ea..24788cb 100644
--- a/.dotnet3.1.metadata
+++ b/.dotnet3.1.metadata
@@ -1 +1 @@
-6d8a2bb600af2f73f425857174dbca974fc9c48f SOURCES/dotnet-v3.1.416-SDK.tar.gz
+009b2cd68b4b75b90eff1b157fae7aedc6c0a08b SOURCES/dotnet-v3.1.417-SDK.tar.gz
diff --git a/.gitignore b/.gitignore
index 4f79380..f753834 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.416-SDK.tar.gz
+SOURCES/dotnet-v3.1.417-SDK.tar.gz
diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec
index a3ce934..b330410 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.22
-%global runtime_version 3.1.22
+%global host_version 3.1.23
+%global runtime_version 3.1.23
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.416
+%global sdk_version 3.1.417
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
 %global host_rpm_version %{host_version}
@@ -61,7 +61,7 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
@@ -339,28 +339,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
 
@@ -440,11 +440,11 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run
 # Provided by dotnet-host from another SRPM
 #install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-#install src/cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet
+#install src/dotnet-cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet
 
 # TODO: the zsh completion script needs to be ported to use #compdef
 #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
-#install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
+#install src/dotnet-cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
 
 # Provided by dotnet-host from another SRPM
 #install -dm 0755 %%{buildroot}%%{_bindir}
@@ -507,6 +507,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
 %{_libdir}/dotnet/source-built-artifacts
 
 %changelog
+* Fri Mar 04 2022 Omair Majid <omajid@redhat.com> - 3.1.417-1
+- Update to .NET SDK 3.1.417 and Runtime 3.1.23
+- Resolves: RHBZ#2060567
+
 * Tue Jan 25 2022 Omair Majid <omajid@redhat.com> - 3.1.416-3
 - Disable bootstrap
 - Resolves: RHBZ#2031429