From 9c45e36242598b8d3c1bdbad8f3c9d4736b85006 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Feb 02 2022 16:56:30 +0000
Subject: Disable bootstrap


---

diff --git a/.gitignore b/.gitignore
index 6c0065e..7ce7466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /dotnet-v3.1.118-SDK.tar.gz
 /dotnet-v3.1.416-SDK-arm64-bootstrap.tar.gz
 /dotnet-v3.1.416-SDK-x64-bootstrap.tar.gz
+/dotnet-v3.1.416-SDK.tar.gz
diff --git a/dotnet3.1.spec b/dotnet3.1.spec
index 50dddab..22ca6f5 100644
--- a/dotnet3.1.spec
+++ b/dotnet3.1.spec
@@ -1,4 +1,4 @@
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 # Avoid provides/requires from private libraries
 %global privlibs             libhostfxr
@@ -55,15 +55,17 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Core Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
 
 # The source is generated on a Fedora box via:
 # ./build-dotnet-tarball v%%{src_version}-SDK
-Source0:        dotnet-v%{src_version}-SDK-x64-bootstrap.tar.gz
-Source1:        dotnet-v%{src_version}-SDK-arm64-bootstrap.tar.gz
+#Source0:        dotnet-v%%{src_version}-SDK-x64-bootstrap.tar.gz
+#Source1:        dotnet-v%%{src_version}-SDK-arm64-bootstrap.tar.gz
+Source0:        dotnet-v%{src_version}-SDK.tar.gz
+
 Source100:      check-debug-symbols.py
 Source101:      dotnet.sh.in
 
@@ -328,11 +330,15 @@ These are not meant for general use.
 
 
 %prep
+%if %{with bootstrap}
 %ifarch x86_64
 %setup -q -T -b 0 -n dotnet-v%{src_version}-SDK-x64-bootstrap
 %else
 %setup -q -T -b 1 -n dotnet-v%{src_version}-SDK-arm64-bootstrap
 %endif
+%else
+%setup -q -n dotnet-v%{src_version}-SDK
+%endif
 
 %if %{without bootstrap}
 # Remove all prebuilts
@@ -390,6 +396,13 @@ grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.common.props || \
 sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/coreclr.common.props
 %endif
 
+%if %{without bootstrap}
+%ifnarch x86_64
+mkdir -p artifacts/obj/%{runtime_arch}/Release
+cp artifacts/obj/x64/Release/PackageVersions.props artifacts/obj/%{runtime_arch}/Release/PackageVersions.props
+%endif
+%endif
+
 cat source-build-info.txt
 
 find -iname 'nuget.config' -exec echo {}: \; -exec cat {} \; -exec echo \;
@@ -556,6 +569,9 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Tue Feb 01 2022 Omair Majid <omajid@redhat.com> - 3.1.416-2
+- Disable bootstrap
+
 * Mon Jan 24 2022 Omair Majid <omajid@redhat.com>  - 3.1.416-1
 - Update to .NET SDK 3.1.416 and Runtime 3.1.22
 
diff --git a/sources b/sources
index 6d242d4..ec10f47 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (dotnet-v3.1.416-SDK-arm64-bootstrap.tar.gz) = 81973d41e5d236725743149a6e69fb1fdc39e0bfb26ebc9fca0a0e4ca18b2b214027c1ccd82849c253f75c577165876fbebc9a00b469859d28e7508396f69b18
-SHA512 (dotnet-v3.1.416-SDK-x64-bootstrap.tar.gz) = 616552a55121e4e91b981742db024a74c516e4971cc12de90f7a25e218aca5680aed3872a3b7542db924a21acaef18505f10d1a7a0ace4bd8ac978fd33b6d035
+SHA512 (dotnet-v3.1.416-SDK.tar.gz) = 719ed62c130fdb0fcd8c70ad05061b29f27f17b4ba71180247b0a48699c4e9d9c8e1859e4ae9148d3953e059a7cae1a37f479ff5d68540b7ffa1029ee8deff67