From 244a8c1b90ae6180c95b95209c4c46fbc8e61eea Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 22 2020 07:30:10 +0000
Subject: import rh-dotnet31-dotnet-3.1.105-1.el7


---

diff --git a/.gitignore b/.gitignore
index 028cb88..a2c673a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.103-SDK.tar.gz
+SOURCES/dotnet-v3.1.105-SDK.tar.gz
diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata
index 6e49727..e6712b3 100644
--- a/.rh-dotnet31-dotnet.metadata
+++ b/.rh-dotnet31-dotnet.metadata
@@ -1 +1 @@
-dd89fdad972077fc2cac51bd6e1d599c833b6e2d SOURCES/dotnet-v3.1.103-SDK.tar.gz
+1627b9aac95a9d357056be097d07191f52eb119b SOURCES/dotnet-v3.1.105-SDK.tar.gz
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index 2bbf66c..e3a9fb9 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -26,10 +26,10 @@
 %endif
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%global host_version 3.1.3
-%global runtime_version 3.1.3
+%global host_version 3.1.5
+%global runtime_version 3.1.5
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.103
+%global sdk_version 3.1.105
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
 %global host_rpm_version %{host_version}
@@ -273,7 +273,7 @@ applications using the .NET Core SDK.
 %setup -q -n dotnet-v%{sdk_version}-SDK
 
 # 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.proj
@@ -281,20 +281,20 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
 # This patch was added when building the tarball; we use a better version
 rm -f patches/corefx/build-corefx-werror.patch
 
-pushd src/corefx.*
+pushd src/dotnet-corefx.*
 %patch100 -p1
 popd
 
-pushd src/coreclr.*
+pushd src/dotnet-coreclr.*
 %patch200 -p1
 popd
 
-pushd src/core-setup.*
+pushd src/dotnet-core-setup.*
 %patch300 -p1
 %patch301 -p1
 popd
 
-pushd src/cli.*
+pushd src/dotnet-cli.*
 %patch500 -p1
 popd
 
@@ -337,11 +337,11 @@ VERBOSE=1 ./build.sh \
 
 %install
 install -dm 0755 %{buildroot}%{_libdir}/dotnet
-ls bin/x64/Release
-tar xf bin/x64/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
+ls artifacts/x64/Release
+tar xf artifacts/x64/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
 
 # Install managed symbols
-tar xf bin/x64/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \
+tar xf artifacts/x64/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \
     -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/
 
 # Fix permissions on files
@@ -364,6 +364,11 @@ chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1
 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/PackageOverrides.txt
 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/FrameworkList.xml
 
+# See https://github.com/dotnet/source-build-reference-packages/pull/121
+rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/obj
+rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/microsoft.netcore.app.ref
+rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/netstandard.library.ref
+rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/obj
 
 # Add ~/.dotnet/tools to $PATH for all users
 install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
@@ -371,11 +376,11 @@ install %{SOURCE2} %{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/cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet
+install src/dotnet-cli.*/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}/%%{_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
 
 install -dm 0755 %{buildroot}%{_bindir}
 ln -s ../../../../../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
@@ -440,6 +445,18 @@ echo "Testing build results for debug symbols..."
 %dir %{_libdir}/dotnet/packs
 
 %changelog
+* Mon Jun 08 2020 Omair Majid <omajid@redhat.com> - 3.1.105-1
+- Update to .NET Core SDK 3.1.105 and Runtime 3.1.5
+- Resolves: RHBZ#1844490
+
+* Wed May 20 2020 Omair Majid <omajid@redhat.com> - 3.1.104-2
+- Update to new tarball for the release
+- Resolves: RHBZ#1832684
+
+* Thu May 07 2020 Omair Majid <omajid@redhat.com> - 3.1.104-1
+- Update to .NET Core SDK 3.1.104 and Runtime 3.1.4
+- Resolves: RHBZ#1832684
+
 * Tue Mar 24 2020 Omair Majid <omajid@redhat.com> - 3.1.103-1
 - Update to .NET Core SDK 3.1.103 and Runtime 3.1.3
 - Resolves: RHBZ#1815631