From 0892b99dee636be4ef59d4883bd2a3ded3aa4fda Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 15 Dec 2021 08:45:22 -0500 Subject: [PATCH] import dotnet5.0-5.0.210-1.el8_5 --- .dotnet5.0.metadata | 2 +- .gitignore | 2 +- SPECS/dotnet5.0.spec | 20 ++++++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata index debb3e9..9d006c0 100644 --- a/.dotnet5.0.metadata +++ b/.dotnet5.0.metadata @@ -1 +1 @@ -d1a80dee6c9e13ae7b2fa12a8b0018286501b91e SOURCES/dotnet-v5.0.209.1-SDK.tar.gz +c8d1317df1ddab04711bf28711c42ba316383647 SOURCES/dotnet-v5.0.210-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 4c240a5..c9baaf4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v5.0.209.1-SDK.tar.gz +SOURCES/dotnet-v5.0.210-SDK.tar.gz diff --git a/SPECS/dotnet5.0.spec b/SPECS/dotnet5.0.spec index 0a48555..880c59b 100644 --- a/SPECS/dotnet5.0.spec +++ b/SPECS/dotnet5.0.spec @@ -20,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 5.0.12 -%global runtime_version 5.0.12 +%global host_version 5.0.13 +%global runtime_version 5.0.13 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 5.0.209 +%global sdk_version 5.0.210 %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -33,7 +33,7 @@ %global sdk_rpm_version %{sdk_version} # upstream can update releases without revving the SDK version so these don't always match -%global src_version %{sdk_version}.1 +%global src_version %{sdk_version} %if 0%{?fedora} || 0%{?rhel} < 8 %global use_bundled_libunwind 0 @@ -326,17 +326,17 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages %endif # Fix bad hardcoded path in build -sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props %patch1 -p1 -pushd src/runtime.* +pushd src/dotnet-runtime.* popd -pushd src/sdk.* +pushd src/dotnet-sdk.* %patch500 -p1 popd @@ -447,7 +447,7 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run # 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/sdk.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet +#install src/dotnet-sdk.*/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 @@ -516,6 +516,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Thu Dec 09 2021 Omair Majid - 5.0.210-1 +- Update to .NET SDK 5.0.210 and Runtime 5.0.13 +- Resolves: RHBZ#2030738 + * Fri Nov 19 2021 Omair Majid - 5.0.209-1 - Update to .NET SDK 5.0.209 and Runtime 5.0.12 - Resolves: RHBZ#2024414