diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata index 4a151ea..a8ce2f2 100644 --- a/.dotnet3.1.metadata +++ b/.dotnet3.1.metadata @@ -1 +1 @@ -f8edfbafa001861019a179c45d4aa73e6873ec13 SOURCES/dotnet-v3.1.104-SDK.tar.gz +41ced806ec9822be40925072dbb59afe8f1083e0 SOURCES/dotnet-v3.1.106-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 0459c0e..155e20f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.104-SDK.tar.gz +SOURCES/dotnet-v3.1.106-SDK.tar.gz diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec index aa704f5..4256bcb 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.4 -%global runtime_version 3.1.4 +%global host_version 3.1.6 +%global runtime_version 3.1.6 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.104 +%global sdk_version 3.1.106 %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: 2%{?dist} +Release: 1%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -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,6 +380,12 @@ 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/ @@ -454,6 +460,18 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog +* Mon Jul 06 2020 Omair Majid - 3.1.106-1 +- Update to .NET Core Runtime 3.1.6 and SDK 3.1.106 +- Resolves: RHBZ#1854137 + +* Mon Jun 08 2020 Omair Majid - 3.1.105-2 +- Remove incorrectly installed files +- Resolves: RHBZ#1844515 + +* Fri Jun 05 2020 Omair Majid - 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 - 3.1.104-2 - Update to new release - Resolves: RHBZ#1833091