From ea6f56aac32df9e3b2977ec8b48f440848b3e1d4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 05 2020 18:30:48 +0000 Subject: import dotnet3.1-3.1.108-2.el8 --- diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata index 73d3b8a..84870f1 100644 --- a/.dotnet3.1.metadata +++ b/.dotnet3.1.metadata @@ -1 +1 @@ -cbd007bf2226177eff0e648339f74da590c71800 SOURCES/dotnet-v3.1.107-SDK.tar.gz +77b866402f12b1b5735a8fdb08febf9f634c229e SOURCES/dotnet-v3.1.108-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 30715b7..dc54aca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.107-SDK.tar.gz +SOURCES/dotnet-v3.1.108-SDK.tar.gz diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec index 0735c42..ff0892d 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.7 -%global runtime_version 3.1.7 +%global host_version 3.1.8 +%global runtime_version 3.1.8 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.107 +%global sdk_version 3.1.108 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -285,7 +285,7 @@ applications using the .NET Core SDK. %dotnet_targeting_pack dotnet-apphost-pack-3.1 %{runtime_rpm_version} Microsoft.NETCore.App 3.1 Microsoft.NETCore.App.Host.%{runtime_id} %dotnet_targeting_pack dotnet-targeting-pack-3.1 %{runtime_rpm_version} Microsoft.NETCore.App 3.1 Microsoft.NETCore.App.Ref %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 +#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref %prep @@ -297,12 +297,12 @@ applications using the .NET Core SDK. %endif # Fix bad hardcoded path in build -sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props -pushd src/dotnet-corefx.* +pushd src/corefx.* %patch100 -p1 %patch103 -p1 %patch104 -p1 @@ -313,12 +313,12 @@ pushd src/coreclr.* %patch201 -p1 popd -pushd src/dotnet-core-setup.* +pushd src/core-setup.* %patch300 -p1 %patch301 -p1 popd -pushd src/dotnet-cli.* +pushd src/cli.* %patch500 -p1 popd @@ -369,24 +369,18 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.props' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pubxml' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} \; chmod 0755 %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/apphost -chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so -chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.8/data/FrameworkList.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.8/data/PackageOverrides.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.8/data/PlatformManifest.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.8/ref/netcoreapp3.1/*.xml chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/nethost.h -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/ref/netcoreapp3.1/*.xml -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/PackageOverrides.txt -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/FrameworkList.xml -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/PlatformManifest.txt -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/PackageOverrides.txt chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/FrameworkList.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/PackageOverrides.txt chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/PlatformManifest.txt -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/PackageOverrides.txt chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/FrameworkList.xml - -# See https://github.com/dotnet/source-build-reference-packages/pull/121 -rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/obj -rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/microsoft.netcore.app.ref -rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/netstandard.library.ref -rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/obj +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/PackageOverrides.txt +chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost +chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so # Provided by dotnet-host from another SRPM #install -dm 0755 %%{buildroot}%{_sysconfdir}/profile.d/ @@ -395,7 +389,7 @@ rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/obj # 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/dotnet-cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet +#install src/cli.*/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 @@ -428,6 +422,9 @@ rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt rm %{buildroot}%{_libdir}/dotnet/dotnet +# 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-hostfxr-3.1 %dir %{_libdir}/dotnet/host/fxr %{_libdir}/dotnet/host/fxr/%{host_version} @@ -452,6 +449,15 @@ rm %{buildroot}%{_libdir}/dotnet/dotnet %dir %{_libdir}/dotnet/packs %changelog +* Fri Sep 04 2020 Omair Majid - 3.1.108-2 +- Stop producing netstandard-targeting-pack-2.1 +- Resolves: RHBZ#1874503 + +* Fri Sep 04 2020 Omair Majid - 3.1.108-1 +- Update to .NET Core SDK 3.1.108 and Runtime 3.1.8 +- Resolves: RHBZ#1874503 +- Resolves: RHBZ#1873454 + * Mon Aug 17 2020 Omair Majid - 3.1.107-2 - Remove subpackages that conflict with dotnet5.0 - Resolves: RHBZ#1862590