diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata index dcb7afc..a687178 100644 --- a/.dotnet3.1.metadata +++ b/.dotnet3.1.metadata @@ -1 +1 @@ -1308d561d5a1f57d51b018babd06a04cd6401a0c SOURCES/dotnet-v3.1.113-SDK.tar.gz +888025430ffdfffda636f91021430537041147b6 SOURCES/dotnet-v3.1.114-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 84ed032..46b01af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.113-SDK.tar.gz +SOURCES/dotnet-v3.1.114-SDK.tar.gz diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec index 4c3d61b..5746235 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.13 -%global runtime_version 3.1.13 +%global host_version 3.1.14 +%global runtime_version 3.1.14 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.113 +%global sdk_version 3.1.114 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -288,6 +288,17 @@ applications using the .NET Core SDK. %dotnet_targeting_pack aspnetcore-targeting-pack-3.1 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 3.1 Microsoft.AspNetCore.App.Ref #%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref +%package -n dotnet-sdk-3.1-source-built-artifacts + +Version: %{sdk_rpm_version} +Summary: Internal package for building .NET Core 3.1 Software Development Kit + +%description -n dotnet-sdk-3.1-source-built-artifacts +The .NET Core source-built archive is a collection of packages needed +to build the .NET Core SDK itself. + +These are not meant for general use. + %prep %ifarch x86_64 @@ -410,6 +421,9 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run #install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet #install install_location %%{buildroot}%%{_sysconfdir}/dotnet/ +install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts +install artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ + # Check debug symbols in all elf objects. This is not in %%check # because native binaries are stripped by rpm-build after %%install. # So we need to do this check earlier. @@ -450,10 +464,15 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/sdk/%{sdk_version} %dir %{_libdir}/dotnet/packs +%files -n dotnet-sdk-3.1-source-built-artifacts +%dir %{_libdir}/dotnet +%{_libdir}/dotnet/source-built-artifacts + %changelog -* Tue Mar 09 2021 Omair Majid - 3.1.113-2 -- Update to .NET Core SDK 3.1.113 and Runtime 3.1.13 -- Resolves: RHBZ#1933376 +* Thu Apr 22 2021 Omair Majid - 3.1.114-2 +- Update to .NET SDK 3.1.114 and Runtime 3.1.14 +- Add dotnet-sdk-3.1-source-built-artifacts subpackage +- Resolves: RHBZ#1946721 * Wed Feb 10 2021 Omair Majid - 3.1.112-2 - Update to .NET Core SDK 3.1.112 and Runtime 3.1.12