From 8227cdd1bb354f6a92ddfb429ec4af23b3061d8d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 15 2021 16:24:54 +0000 Subject: import dotnet5.0-5.0.207-3.el8 --- diff --git a/SPECS/dotnet5.0.spec b/SPECS/dotnet5.0.spec index 463c2c5..04beb77 100644 --- a/SPECS/dotnet5.0.spec +++ b/SPECS/dotnet5.0.spec @@ -56,7 +56,7 @@ Name: dotnet5.0 Version: %{sdk_rpm_version} -Release: 2%{?dist} +Release: 3%{?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/ @@ -290,7 +290,7 @@ applications using the .NET SDK. %dotnet_targeting_pack dotnet-apphost-pack-5.0 %{runtime_rpm_version} Microsoft.NETCore.App 5.0 Microsoft.NETCore.App.Host.%{runtime_id} %dotnet_targeting_pack dotnet-targeting-pack-5.0 %{runtime_rpm_version} Microsoft.NETCore.App 5.0 Microsoft.NETCore.App.Ref %dotnet_targeting_pack aspnetcore-targeting-pack-5.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 5.0 Microsoft.AspNetCore.App.Ref -%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref +#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref %package -n dotnet-sdk-5.0-source-built-artifacts @@ -440,26 +440,31 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/nethost.h chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/singlefilehost -install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ -install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ +# Provided by dotnet-host from another SRPM +#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/ +#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/ -install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions +# 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/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 #install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet -install -dm 0755 %{buildroot}%{_bindir} -ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/ +# Provided by dotnet-host from another SRPM +#install -dm 0755 %%{buildroot}%%{_bindir} +#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/ -install -dm 0755 %{buildroot}%{_mandir}/man1/ -find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \; +# Provided by dotnet-host from another SRPM +#install -dm 0755 %%{buildroot}%%{_mandir}/man1/ +#find -iname 'dotnet*.1' -type f -exec cp {} %%{buildroot}%%{_mandir}/man1/ \; -echo "%{_libdir}/dotnet" >> install_location -install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet -install install_location %{buildroot}%{_sysconfdir}/dotnet/ +# Provided by dotnet-host from another SRPM +#echo "%%{_libdir}/dotnet" >> install_location +#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/ @@ -470,28 +475,17 @@ install artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz echo "Testing build results for debug symbols..." %{SOURCE1} -v %{buildroot}%{_libdir}/dotnet/ - -%check +# Self-check %{buildroot}%{_libdir}/dotnet/dotnet --info +# Provided by dotnet-host from another SRPM +rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt +rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt +rm %{buildroot}%{_libdir}/dotnet/dotnet -%files -n dotnet -# empty package useful for dependencies +# Provided by netstandard-targeting-pack-2.1 from another SRPM +rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 -%files -n dotnet-host -%dir %{_libdir}/dotnet -%{_libdir}/dotnet/dotnet -%dir %{_libdir}/dotnet/host -%dir %{_libdir}/dotnet/host/fxr -%{_bindir}/dotnet -%license %{_libdir}/dotnet/LICENSE.txt -%license %{_libdir}/dotnet/ThirdPartyNotices.txt -%doc %{_mandir}/man1/dotnet*.1.gz -%{_sysconfdir}/profile.d/dotnet.sh -%{_sysconfdir}/dotnet -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/dotnet %files -n dotnet-hostfxr-5.0 %dir %{_libdir}/dotnet/host/fxr @@ -522,6 +516,10 @@ echo "Testing build results for debug symbols..." %changelog +* Sun Oct 10 2021 Omair Majid - 5.0.207-3 +- Disable subpackages that will be provided by .NET 6 SRPM +- Resolves: RHBZ#1986017 + * Fri Sep 24 2021 Omair Majid - 5.0.207-2 - Update to .NET SDK 5.0.207 and Runtime 5.0.10 - Resolves: RHBZ#2000319