From 37fa247fd559c16d57e08c7521c5c823944f15d7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 11 2022 13:13:55 +0000
Subject: import rh-dotnet60-dotnet-6.0.105-1.el7_9


---

diff --git a/.gitignore b/.gitignore
index 1f6646c..d1f5881 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v6.0.104-SDK.tar.gz
+SOURCES/dotnet-v6.0.105-SDK.tar.gz
diff --git a/.rh-dotnet60-dotnet.metadata b/.rh-dotnet60-dotnet.metadata
index f9f015e..1ad33f8 100644
--- a/.rh-dotnet60-dotnet.metadata
+++ b/.rh-dotnet60-dotnet.metadata
@@ -1 +1 @@
-d2acb5b7d1bc2f0650a753b3dee050226eb924a6 SOURCES/dotnet-v6.0.104-SDK.tar.gz
+6919a1bccd1aa4802538b001f1416d7c803f26e0 SOURCES/dotnet-v6.0.105-SDK.tar.gz
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index eba86cf..d40e668 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -23,10 +23,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 6.0.4
-%global runtime_version 6.0.4
+%global host_version 6.0.5
+%global runtime_version 6.0.5
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.104
+%global sdk_version 6.0.105
 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -210,10 +210,10 @@ Requires:       %{?scl_prefix}dotnet-hostfxr-6.0%{?_isa} >= %{host_rpm_version}-
 # libicu is dlopen()ed
 Requires:       libicu%{?_isa}
 
-# See src/runtime.*/src/libraries/Native/AnyOS/brotli-version.txt
+# See src/runtime/src/libraries/Native/AnyOS/brotli-version.txt
 Provides: bundled(libbrotli) = 1.0.9
 %if %{use_bundled_libunwind}
-# See runtime.*/src/coreclr/pal/src/libunwind/libunwind-version.txt
+# See runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
 Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1
 %endif
 
@@ -373,60 +373,60 @@ 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/runtime.*/src/native/corehost/hostmisc/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
 
 # Disable warnings
 # sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
 
-pushd src/runtime.*
+pushd src/runtime
 popd
 
-pushd src/command-line-api.*
+pushd src/command-line-api
 %patch300 -p1
 popd
 
-pushd src/vstest.*
+pushd src/vstest
 %patch400 -p1
 popd
 
-pushd src/fsharp.*
+pushd src/fsharp
 %patch500 -p1
 %patch501 -p1
 popd
 
-pushd src/xliff-tasks.*
+pushd src/xliff-tasks
 %patch600 -p1
 popd
 
-pushd src/arcade.*
+pushd src/arcade
 %patch700 -p1
 popd
 
-pushd src/roslyn.*
+pushd src/roslyn
 %patch800 -p3
 %patch801 -p1
 popd
 
-pushd src/roslyn-analyzers.*
+pushd src/roslyn-analyzers
 %patch900 -p1
 popd
 
-pushd src/sdk.*
+pushd src/sdk
 %patch1500 -p1
 %patch1501 -p1
 popd
 
-pushd src/installer.*
+pushd src/installer
 %patch1600 -p1
 popd
 
 # Disable package validation which breaks our build, even though we
 # are injecting "blessed" nuget packages produced by Microsoft.
 # There's no need to run validation in RPM packages anyway.
-sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime.*/eng/SourceBuild.props
+sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime/eng/SourceBuild.props
 
 %if ! %{use_bundled_libunwind}
-sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props
+sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
 %endif
 
 
@@ -530,7 +530,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
 
 install -dm 0755 %{buildroot}/%{_root_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/sdk.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet
+install src/sdk/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet
 
 # TODO: the zsh completion script needs to be ported to use #compdef
 #install -dm 755 %%{buildroot}/%%{_root_datadir}/zsh/site-functions
@@ -616,6 +616,10 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Thu May 05 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
+- Update to .NET SDK 6.0.105 and Runtime 6.0.5
+- Resolves: RHBZ#2082264
+
 * Tue Apr 05 2022 Omair Majid <omajid@redhat.com> - 6.0.104-1
 - Update to .NET SDK 6.0.104 and Runtime 6.0.4
 - Resolves: RHBZ#2072103