From 71d20d216be4792ecc6b2af95e0eea4fbb9b811d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 09 2020 21:13:12 +0000
Subject: import dotnet3.1-3.1.105-2.el8_2


---

diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata
index 4931058..3920b02 100644
--- a/.dotnet3.1.metadata
+++ b/.dotnet3.1.metadata
@@ -1 +1 @@
-0d2b94cb9441ab154c9e79f320a46cfd06ff7ddf SOURCES/dotnet-v3.1.103-SDK.tar.gz
+3818a42e01f00d5fe00548704a1878bc38fc74ef SOURCES/dotnet-v3.1.105-SDK.tar.gz
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/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec
index 61bd78e..2b96149 100644
--- a/SPECS/dotnet3.1.spec
+++ b/SPECS/dotnet3.1.spec
@@ -23,10 +23,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}
@@ -296,27 +296,27 @@ applications using the .NET Core SDK.
 %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
 
-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
 %patch301 -p1
 popd
 
-pushd src/cli.*
+pushd src/dotnet-cli.*
 %patch500 -p1
 popd
 
@@ -353,11 +353,11 @@ sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE101} > dotnet.sh
 
 %install
 install -dm 0755 %{buildroot}%{_libdir}/dotnet
-ls bin/%{runtime_arch}/Release
-tar xf bin/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
+ls artifacts/%{runtime_arch}/Release
+tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
 
 # Install managed symbols
-tar xf bin/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \
+tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \
     -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/
 
 # Fix executable permissions on files
@@ -380,12 +380,18 @@ chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/
 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
+
 install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
 install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
 
 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
@@ -454,6 +460,22 @@ echo "Testing build results for debug symbols..."
 %dir %{_libdir}/dotnet/packs
 
 %changelog
+* Mon Jun 08 2020 Omair Majid <omajid@redhat.com> - 3.1.105-2
+- Remove incorrectly installed files
+- Resolves: RHBZ#1844515
+
+* Fri Jun 05 2020 Omair Majid <omajid@redhat.com> - 3.1.105-1
+- Update to .NET Core Runtime 3.1.5 and SDK 3.1.105
+- Resolves: RHBZ#1844515
+
+* Thu May 07 2020 Omair Majid <omajid@redhat.com> - 3.1.104-2
+- Update to new release
+- Resolves: RHBZ#1833091
+
+* Thu May 07 2020 Omair Majid <omajid@redhat.com> - 3.1.104-1
+- Update to .NET Core Runtime 3.1.4 and SDK 3.1.104
+- Resolves: RHBZ#1833091
+
 * Fri Mar 20 2020 Omair Majid <omajid@redhat.com> - 3.1.103-2
 - Update to .NET Core Runtime 3.1.3 and SDK 3.1.103
 - Resolves: RHBZ#1815632