From 4b783a12e3e4354e7b55164e4fdb67f4191e8b83 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 19 2020 18:27:55 +0000
Subject: import dotnet3.1-3.1.107-2.el8


---

diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata
index a8ce2f2..73d3b8a 100644
--- a/.dotnet3.1.metadata
+++ b/.dotnet3.1.metadata
@@ -1 +1 @@
-41ced806ec9822be40925072dbb59afe8f1083e0 SOURCES/dotnet-v3.1.106-SDK.tar.gz
+cbd007bf2226177eff0e648339f74da590c71800 SOURCES/dotnet-v3.1.107-SDK.tar.gz
diff --git a/.gitignore b/.gitignore
index 155e20f..30715b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.106-SDK.tar.gz
+SOURCES/dotnet-v3.1.107-SDK.tar.gz
diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec
index 62601e0..0735c42 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.6
-%global runtime_version 3.1.6
+%global host_version 3.1.7
+%global runtime_version 3.1.7
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.106
+%global sdk_version 3.1.107
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
 %global host_rpm_version %{host_version}
@@ -59,7 +59,7 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        6%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
@@ -388,26 +388,31 @@ rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/micro
 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/
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}%{_sysconfdir}/profile.d/
+#install dotnet.sh %%{buildroot}%{_sysconfdir}/profile.d/
 
-install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/dotnet-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
 #install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
 
-install -dm 0755 %{buildroot}%{_bindir}
-ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}%%{_bindir}
+#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/
 
-install -dm 0755 %{buildroot}%{_mandir}/man1/
-find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \;
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}%%{_mandir}/man1/
+#find -iname 'dotnet*.1' -type f -exec cp {} %%{buildroot}%%{_mandir}/man1/ \;
 
-echo "%{_libdir}/dotnet" >> install_location
-install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet
-install install_location %{buildroot}%{_sysconfdir}/dotnet/
+# Provided by dotnet-host from another SRPM
+#echo "%%{_libdir}/dotnet" >> install_location
+#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet
+#install install_location %%{buildroot}%%{_sysconfdir}/dotnet/
 
 # Check debug symbols in all elf objects. This is not in %%check
 # because native binaries are stripped by rpm-build after %%install.
@@ -415,28 +420,13 @@ install install_location %{buildroot}%{_sysconfdir}/dotnet/
 echo "Testing build results for debug symbols..."
 %{SOURCE100} -v %{buildroot}%{_libdir}/dotnet/
 
-
-%check
+# Self-check
 %{buildroot}%{_libdir}/dotnet/dotnet --info
 
-
-%files -n dotnet
-# empty package useful for dependencies
-
-%files -n dotnet-host
-%dir %{_libdir}/dotnet
-%{_libdir}/dotnet/dotnet
-%dir %{_libdir}/dotnet/host
-%dir %{_libdir}/dotnet/host/fxr
-%{_bindir}/dotnet
-%license %{_libdir}/dotnet/LICENSE.txt
-%license %{_libdir}/dotnet/ThirdPartyNotices.txt
-%doc %{_mandir}/man1/dotnet*.1.gz
-%{_sysconfdir}/profile.d/dotnet.sh
-%{_sysconfdir}/dotnet
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/dotnet
+# Provided by dotnet-host from another SRPM
+rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt
+rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt
+rm %{buildroot}%{_libdir}/dotnet/dotnet
 
 %files -n dotnet-hostfxr-3.1
 %dir %{_libdir}/dotnet/host/fxr
@@ -462,6 +452,15 @@ echo "Testing build results for debug symbols..."
 %dir %{_libdir}/dotnet/packs
 
 %changelog
+* Mon Aug 17 2020 Omair Majid <omajid@redhat.com> - 3.1.107-2
+- Remove subpackages that conflict with dotnet5.0
+- Resolves: RHBZ#1862590
+
+* Thu Aug 13 2020 Omair Majid <omajid@redhat.com> - 3.1.107-1
+- Update to .NET Core SDK 3.1.107 and Runtime 3.1.7
+- Resolves: RHBZ#1862590
+- Resolves: RHBZ#1861114
+
 * Thu Jul 30 2020 Omair Majid <omajid@redhat.com> - 3.1.106-6
 - Remove duplicate LDFLAGS (actually typoed ASMFLAGS) for build
 - Resolves: RHBZ#1811776