From d26401eab2d246bb295e0af6a1e22dfec3d00c33 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 29 2021 17:26:50 +0000 Subject: import rh-dotnet50-dotnet-5.0.205-2.el7_9 --- diff --git a/.gitignore b/.gitignore index 107be80..4c8ecdf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v5.0.205-SDK.tar.gz +SOURCES/dotnet-v5.0.205.2-SDK.tar.gz diff --git a/.rh-dotnet50-dotnet.metadata b/.rh-dotnet50-dotnet.metadata index f2da14d..d591f5f 100644 --- a/.rh-dotnet50-dotnet.metadata +++ b/.rh-dotnet50-dotnet.metadata @@ -1 +1 @@ -7dcde611e8dcb950ae71de0470cd2e9e626574bc SOURCES/dotnet-v5.0.205-SDK.tar.gz +4312257682ff1d9ccc6069bf773c4baed2050d6d SOURCES/dotnet-v5.0.205.2-SDK.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 3944ac2..b1a557b 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -37,7 +37,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} +%global src_version %{sdk_version}.2 %if 0%{?fedora} || 0%{?rhel} < 8 %global use_bundled_libunwind 0 @@ -60,7 +60,7 @@ Name: %{?scl_prefix}dotnet Version: %{sdk_rpm_version} -Release: 1%{?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/ @@ -320,7 +320,7 @@ 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/dotnet-runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props @@ -328,11 +328,11 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props %patch1 -p1 %patch2 -p1 -pushd src/dotnet-runtime.* +pushd src/runtime.* %patch100 -p1 popd -pushd src/dotnet-sdk.* +pushd src/sdk.* %patch500 -p1 popd @@ -452,7 +452,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ install -dm 0755 %{buildroot}/%{_root_datadir}/bash-completion/completions # dynamic completion needs the file to be named the same as the base command -install src/dotnet-sdk.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet +install src/sdk.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet # TODO: the zsh completion script needs to be ported to use #compdef #install -dm 755 %%{buildroot}/%%{_root_datadir}/zsh/site-functions @@ -529,6 +529,10 @@ echo "Testing build results for debug symbols..." %changelog +* Mon Jul 26 2021 Omair Majid - 5.0.205-2 +- Updated to new upstream release of SDK 5.0.205 and Runtime 5.0.8 +- Resolves: RHBZ#1985444 + * Wed Jul 07 2021 Andrew Slice - 5.0.205-1 - Update to .NET SDK 5.0.205 and Runtime 5.0.8 - Added a patch to remove references to the tests directory from other patches.