diff --git a/0001-dotnet-anolis-add-distro.patch b/0001-dotnet-anolis-add-distro.patch deleted file mode 100644 index 48cfd329d6c4529cdb5b460e88fb3df8066c9891..0000000000000000000000000000000000000000 --- a/0001-dotnet-anolis-add-distro.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff -Nurw dotnet-v3.1.424-SDK-bak/repos/core-setup.common.targets dotnet-v3.1.424-SDK/repos/core-setup.common.targets ---- dotnet-v3.1.424-SDK-bak/repos/core-setup.common.targets 2022-06-30 12:53:32.000000000 -0400 -+++ dotnet-v3.1.424-SDK/repos/core-setup.common.targets 2022-07-29 02:58:33.098782259 -0400 -@@ -38,6 +38,9 @@ - -+ - - - -diff -Nurw dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json ---- dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2022-06-30 14:33:13.000000000 -0400 -+++ dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2022-07-29 03:10:13.824095412 -0400 -@@ -650,6 +650,80 @@ - "any", - "base" - ], -+ "anolis": [ -+ "anolis", -+ "rhel", -+ "linux", -+ "unix", -+ "any", -+ "base" -+ ], -+ "anolis-arm64": [ -+ "anolis-arm64", -+ "anolis", -+ "rhel-arm64", -+ "rhel", -+ "linux-arm64", -+ "linux", -+ "unix-arm64", -+ "unix", -+ "any", -+ "base" -+ ], -+ "anolis-x64": [ -+ "anolis-x64", -+ "anolis", -+ "rhel-x64", -+ "rhel", -+ "linux-x64", -+ "linux", -+ "unix-x64", -+ "unix", -+ "any", -+ "base" -+ ], -+ "anolis.8": [ -+ "anolis.8", -+ "anolis", -+ "rhel.8", -+ "rhel", -+ "linux", -+ "unix", -+ "any", -+ "base" -+ ], -+ "anolis.8-arm64": [ -+ "anolis.8-arm64", -+ "anolis.8", -+ "anolis-arm64", -+ "rhel.8-arm64", -+ "anolis", -+ "rhel.8", -+ "rhel-arm64", -+ "rhel", -+ "linux-arm64", -+ "linux", -+ "unix-arm64", -+ "unix", -+ "any", -+ "base" -+ ], -+ "anolis.8-x64": [ -+ "anolis.8-x64", -+ "anolis.8", -+ "anolis-x64", -+ "rhel.8-x64", -+ "anolis", -+ "rhel.8", -+ "rhel-x64", -+ "rhel", -+ "linux-x64", -+ "linux", -+ "unix-x64", -+ "unix", -+ "any", -+ "base" -+ ], - "debian": [ - "debian", - "linux", -diff -Nurw dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props ---- dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-06-30 14:33:13.000000000 -0400 -+++ dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-07-29 03:17:32.883277529 -0400 -@@ -40,6 +40,14 @@ - false - - -+ -+ rhel -+ x64;arm64 -+ 8 -+ true -+ false -+ -+ - - linux - x64;x86;arm;armel;arm64 -@@ -193,6 +201,6 @@ - RuntimeJson="runtime.json" - CompatibilityMap="runtime.compatibility.json" - RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml" -- UpdateRuntimeFiles="$(UpdateRuntimeFiles)" /> -+ UpdateRuntimeFiles="true" /> - - -diff -Nurw dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.json ---- dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-06-30 14:33:13.000000000 -0400 -+++ dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-07-29 03:20:26.382373685 -0400 -@@ -249,6 +249,44 @@ - "rhel.9-x64" - ] - }, -+ "anolis": { -+ "#import": [ -+ "rhel" -+ ] -+ }, -+ "anolis-arm64": { -+ "#import": [ -+ "anolis", -+ "rhel-arm64" -+ ] -+ }, -+ "anolis-x64": { -+ "#import": [ -+ "anolis", -+ "rhel-x64" -+ ] -+ }, -+ "anolis.8": { -+ "#import": [ -+ "anolis", -+ "rhel.8" -+ ] -+ }, -+ "anolis.8-arm64": { -+ "#import": [ -+ "anolis.8", -+ "anolis-arm64", -+ "rhel.8-arm64" -+ ] -+ }, -+ -+ "anolis.8-x64": { -+ "#import": [ -+ "anolis.8", -+ "anolis-x64", -+ "rhel.8-x64" -+ ] -+ }, - "debian": { - "#import": [ - "linux" diff --git a/dist b/dist index 0ee7539a2292be885eb3a6caf1a4ee4666e5e99f..535c6900412d365bb0ff6de8d1f27110833b3ae3 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_6 +an8_7 diff --git a/dotnet3.1.spec b/dotnet3.1.spec index cf996b1a2dcb8c13c00993e56775d9801b52e77a..87e94b7e5cf39be55693262cb15d4a1bc9168e9b 100644 --- a/dotnet3.1.spec +++ b/dotnet3.1.spec @@ -1,5 +1,3 @@ -%define anolis_os_version %(source /etc/os-release; echo ${VERSION}) -%define anolis_release .0.1 %bcond_with bootstrap # Avoid provides/requires from private libraries @@ -27,10 +25,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.30 -%global runtime_version 3.1.30 +%global host_version 3.1.32 +%global runtime_version 3.1.32 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.424 +%global sdk_version 3.1.426 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -57,13 +55,13 @@ %if 0%{?centos} %global runtime_id centos.%{centos}-%{runtime_arch} %else -%global runtime_id anolis.%{anolis_os_version}-%{runtime_arch} +%global runtime_id rhel.%{rhel}-%{runtime_arch} %endif %endif Name: dotnet3.1 Version: %{sdk_rpm_version} -Release: 1%{anolis_release}%{?dist} +Release: 1%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -89,8 +87,6 @@ Patch301: core-setup-no-werror.patch Patch500: cli-telemetry-optout.patch -Patch1000: 0001-dotnet-anolis-add-distro.patch - ExclusiveArch: x86_64 BuildRequires: clang @@ -372,8 +368,6 @@ pushd src/dotnet-cli.* %patch500 -p1 popd -%patch1000 -p1 - # If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.common.props || \ sed -i 's|\$(BuildArguments) |$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' repos/coreclr.common.props @@ -444,8 +438,8 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run 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/ -#install dotnet.sh %%{buildroot}%{_sysconfdir}/profile.d/ +#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}/%%{_datadir}/bash-completion/completions @@ -517,40 +511,37 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/source-built-artifacts %changelog -* Thu Oct 13 2022 Liwei Ge - 3.1.424-1.0.1 -- Add anolis distro info(Liwei Ge) - -* Mon Oct 03 2022 Omair Majid - 3.1.424-1 -- Update to .NET SDK 3.1.424 and Runtime 3.1.30 -- Resolves: RHBZ#2131728 +* Wed Nov 30 2022 Omair Majid - 3.1.426-1 +- Update to .NET SDK 3.1.426 and Runtime 3.1.32 +- Resolves: RHBZ#2148219 -* Fri Sep 02 2022 Omair Majid - 3.1.423-1 +* Wed Sep 14 2022 Omair Majid - 3.1.423-2 - Update to .NET SDK 3.1.423 and Runtime 3.1.29 -- Resolves: RHBZ#2123785 +- Resolves: RHBZ#2123784 -* Thu Aug 04 2022 Omair Majid - 3.1.422-1 +* Tue Aug 09 2022 Omair Majid - 3.1.422-2 - Update to .NET SDK 3.1.422 and Runtime 3.1.28 -- Resolves: RHBZ#2115351 +- Resolves: RHBZ#2115350 -* Tue Jul 05 2022 Andrew Slice - 3.1.421-1 +* Thu Jul 21 2022 Omair Majid - 3.1.421-2 - Update to .NET SDK 3.1.421 and Runtime 3.1.27 - Resolves: RHBZ#2103273 -* Mon Jun 13 2022 Omair Majid - 3.1.420-1 +* Thu Jun 23 2022 Omair Majid - 3.1.420-1 - Update to .NET SDK 3.1.420 and Runtime 3.1.26 -- Resolves: RHBZ#2096319 +- Resolves: RHBZ#2096318 -* Thu May 05 2022 Omair Majid - 3.1.419-1 +* Mon May 16 2022 Omair Majid - 3.1.419-1 - Update to .NET SDK 3.1.419 and Runtime 3.1.25 -- Resolves: RHBZ#2081443 +- Resolves: RHBZ#2081442 -* Fri Apr 22 2022 Omair Majid - 3.1.418-1 -- Update to .NET SDK 3.1.418 and Runtime 3.1.24 -- Resolves: RHBZ#2074654 +* Wed Apr 27 2022 Omair Majid - 3.1.418-2 +- Bump release +- Related: RHBZ#2072012 -* Mon Mar 28 2022 Omair Majid - 3.1.417-1 -- Update to .NET SDK 3.1.417 and Runtime 3.1.23 -- Resolves: RHBZ#2060566 +* Mon Apr 25 2022 Omair Majid - 3.1.418-1 +- Update to .NET SDK 3.1.418 and Runtime 3.1.24 +- Resolves: RHBZ#2072012 * Tue Jan 25 2022 Omair Majid - 3.1.416-4 - Update to .NET SDK 3.1.416 and Runtime 3.1.22 diff --git a/download b/download index 4be5d67ecf9c69399b02170f666650f72a2b0afe..f7e6cfd6158f2d0944903844f85bb170da2763bf 100644 --- a/download +++ b/download @@ -1 +1 @@ -3a05e4adf0d37f874d20d11092c54c77 dotnet-v3.1.424-SDK.tar.gz +f0f762c00877298dd62a41e085db8267 dotnet-v3.1.426-SDK.tar.gz