From b74143264788de9b1bde4d2bf66697dd5f37aed4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 27 Jan 2022 04:56:01 +0000
Subject: [PATCH] import dotnet3.1-3.1.416-3.el8_5

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

diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata
index f7e8002..d5151ea 100644
--- a/.dotnet3.1.metadata
+++ b/.dotnet3.1.metadata
@@ -1 +1 @@
-c7b68fa84aebce86eda4642b4d0755b9cfb731f2 SOURCES/dotnet-v3.1.416-SDK-x64-bootstrap.tar.gz
+6d8a2bb600af2f73f425857174dbca974fc9c48f SOURCES/dotnet-v3.1.416-SDK.tar.gz
diff --git a/.gitignore b/.gitignore
index 1c846d8..4f79380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.416-SDK-x64-bootstrap.tar.gz
+SOURCES/dotnet-v3.1.416-SDK.tar.gz
diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec
index f39aa24..a3ce934 100644
--- a/SPECS/dotnet3.1.spec
+++ b/SPECS/dotnet3.1.spec
@@ -1,4 +1,4 @@
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 # Avoid provides/requires from private libraries
 %global privlibs             libhostfxr
@@ -61,14 +61,14 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
 
 # ./build-dotnet-tarball dotnet-v%%{sdk_version}-SDK
-#Source0:        dotnet-v%%{sdk_version}-SDK.tar.gz
-Source0:        dotnet-v%{sdk_version}-SDK-x64-bootstrap.tar.gz
+Source0:        dotnet-v%{sdk_version}-SDK.tar.gz
+#Source0:        dotnet-v%%{sdk_version}-SDK-x64-bootstrap.tar.gz
 
 Source100:      check-debug-symbols.py
 Source101:      dotnet.sh.in
@@ -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/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
 
 # Disable warnings
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props
 
 %patch1 -p1
 
-pushd src/dotnet-corefx.*
+pushd src/corefx.*
 %patch100 -p1
 %patch103 -p1
 popd
 
-pushd src/dotnet-coreclr.*
+pushd src/coreclr.*
 %patch200 -p1
 #%%patch201 -p1
 popd
 
-pushd src/dotnet-core-setup.*
+pushd src/core-setup.*
 %patch300 -p1
 popd
 
-pushd src/dotnet-cli.*
+pushd src/cli.*
 %patch500 -p1
 popd
 
@@ -507,6 +507,14 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
 %{_libdir}/dotnet/source-built-artifacts
 
 %changelog
+* Tue Jan 25 2022 Omair Majid <omajid@redhat.com> - 3.1.416-3
+- Disable bootstrap
+- Resolves: RHBZ#2031429
+
+* Fri Jan 21 2022 Omair Majid <omajid@redhat.com> - 3.1.416-2
+- Update to new release of .NET SDK 3.1.416 and Runtime 3.1.22
+- Resolves: RHBZ#2031429
+
 * Tue Dec 14 2021 Omair Majid <omajid@redhat.com> - 3.1.416-1
 - Update to .NET SDK 3.1.416 and Runtime 3.1.22
 - Resolves: RHBZ#2031429