From d21d3bff80c34f0b76b24b495c22d3ff39dc0069 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 13 2021 16:38:37 +0000 Subject: import dotnet5.0-5.0.102-2.el8_3 --- diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata index fb8f0ac..7755f8d 100644 --- a/.dotnet5.0.metadata +++ b/.dotnet5.0.metadata @@ -1 +1 @@ -99595a158d9deccaeb02f642eb8a7fb837b50a2e SOURCES/dotnet-v5.0.100-SDK-337413b.tar.gz +b38b36bd3ef48e53459b75e75652368b7b753ae2 SOURCES/dotnet-v5.0.102-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 8632dbf..977de64 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v5.0.100-SDK-337413b.tar.gz +SOURCES/dotnet-v5.0.102-SDK.tar.gz diff --git a/SPECS/dotnet5.0.spec b/SPECS/dotnet5.0.spec index cb1b0ad..9ccd4e0 100644 --- a/SPECS/dotnet5.0.spec +++ b/SPECS/dotnet5.0.spec @@ -20,11 +20,11 @@ %global dotnet_cflags %(echo %optflags | sed -e 's/-fstack-clash-protection//' | sed -re 's/-specs=[^ ]*//g') %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 5.0.0 -%global runtime_version 5.0.0 -%global aspnetcore_runtime_version 5.0.0 -%global sdk_version 5.0.100 -%global templates_version 5.0.0 +%global host_version 5.0.2 +%global runtime_version 5.0.2 +%global aspnetcore_runtime_version %{runtime_version} +%global sdk_version 5.0.102 +%global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -56,14 +56,14 @@ Name: dotnet5.0 Version: %{sdk_rpm_version} -Release: 0.8.0201202git337413b%{?dist} +Release: 2%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ # The source is generated on a Fedora box via: # ./build-dotnet-tarball v%%{src_version}-SDK -Source0: dotnet-v%{src_version}-SDK-337413b.tar.gz +Source0: dotnet-v%{src_version}-SDK.tar.gz Source1: check-debug-symbols.py Source2: dotnet.sh.in @@ -306,7 +306,7 @@ These are not meant for general use. %prep -%setup -q -n dotnet-v%{src_version}-SDK-337413b +%setup -q -n dotnet-v%{src_version}-SDK %if %{without bootstrap} # Remove all prebuilts @@ -327,18 +327,18 @@ 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.* %patch100 -p1 popd -pushd src/sdk.* +pushd src/dotnet-sdk.* %patch500 -p1 popd @@ -419,7 +419,7 @@ 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/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 @@ -496,6 +496,14 @@ echo "Testing build results for debug symbols..." %changelog +* Mon Jan 05 2021 Omair Majid - 5.0.102-2 +- Rebuild with updated tests +- Resolves: RHBZ#1912684 + +* Mon Jan 04 2021 Omair Majid - 5.0.102-1 +- Update to .NET SDK 5.0.102 and Runtime 5.0.2 +- Resolves: RHBZ#1912684 + * Thu Dec 03 2020 Omair Majid - 5.0.100-0.8.0201202git337413b - Update to latest commit of .NET Core SDK 5.0.100 and Runtime 5.0.0 - Resolves: RHBZ#1897396