diff --git a/0001-dotnet-anolis-add-distro.patch b/0001-dotnet-anolis-add-distro.patch index d88ca3cd21e5238cd22f5b7b0a02096b311bf61d..a543cc389dcbb8981eba5ad67792464d2237e0ad 100644 --- a/0001-dotnet-anolis-add-distro.patch +++ b/0001-dotnet-anolis-add-distro.patch @@ -23,10 +23,10 @@ index 81c6ecebd..3110be658 100644 -diff --git a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +diff --git a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json index 382ee4552..0277f97b0 100644 ---- a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -+++ b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +--- a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json ++++ b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json @@ -547,6 +547,80 @@ "any", "base" @@ -108,10 +108,10 @@ index 382ee4552..0277f97b0 100644 "debian": [ "debian", "linux", -diff --git a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.json +diff --git a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.json index 382ee4552..0277f97b0 100644 ---- a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-12-11 06:54:19.000000000 +0800 -+++ b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-02-28 23:54:04.700075540 +0800 +--- a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-12-11 06:54:19.000000000 +0800 ++++ b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-02-28 23:54:04.700075540 +0800 @@ -227,6 +227,44 @@ "rhel.9-x64" ] @@ -157,10 +157,10 @@ index 382ee4552..0277f97b0 100644 "debian": { "#import": [ "linux" -diff --git a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +diff --git a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props index faa697f34..82ee1d5a4 100644 ---- a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -+++ b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +--- a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props ++++ b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props @@ -40,6 +40,14 @@ false diff --git a/dotnet3.1.spec b/dotnet3.1.spec index 15023d51e054ab300989960d718a4d9c65ea96a5..d0251e7ebc3532109e0e371713b362b73a8000c8 100644 --- a/dotnet3.1.spec +++ b/dotnet3.1.spec @@ -27,10 +27,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.22 -%global runtime_version 3.1.22 +%global host_version 3.1.23 +%global runtime_version 3.1.23 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.416 +%global sdk_version 3.1.417 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -63,7 +63,7 @@ Name: dotnet3.1 Version: %{sdk_rpm_version} -Release: 3%{anolis_release}%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -343,28 +343,28 @@ 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/core-setup.*/src/corehost/common/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props %patch1 -p1 -pushd src/corefx.* +pushd src/dotnet-corefx.* %patch100 -p1 %patch103 -p1 popd -pushd src/coreclr.* +pushd src/dotnet-coreclr.* %patch200 -p1 #%%patch201 -p1 popd -pushd src/core-setup.* +pushd src/dotnet-core-setup.* %patch300 -p1 popd -pushd src/cli.* +pushd src/dotnet-cli.* %patch500 -p1 popd @@ -446,11 +446,11 @@ 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/cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet +#install src/dotnet-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 -#install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet +#install src/dotnet-cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet # Provided by dotnet-host from another SRPM #install -dm 0755 %%{buildroot}%%{_bindir} @@ -513,9 +513,13 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/source-built-artifacts %changelog -* Thu Feb 24 2022 Weitao Zhou - 3.1.416-3.0.1 +* Sat Mar 12 2022 Liwei Ge - 3.1.417-1.0.1 - Add anolis distro info(Liwei Ge) +* Fri Mar 04 2022 Omair Majid - 3.1.417-1 +- Update to .NET SDK 3.1.417 and Runtime 3.1.23 +- Resolves: RHBZ#2060567 + * Tue Jan 25 2022 Omair Majid - 3.1.416-3 - Disable bootstrap - Resolves: RHBZ#2031429 diff --git a/download b/download index 0c6ed7f6671a1e5634ad03227d59be175f427987..907b91808a5f6998186b4ba1c55782b33dff631e 100644 --- a/download +++ b/download @@ -1 +1 @@ -2680c20d8f940a04f21979f672410354 dotnet-v3.1.416-SDK.tar.gz +90a62ba0fbd083bd2f912f54ae361285 dotnet-v3.1.417-SDK.tar.gz