diff --git a/2000-anolis-dotnet-add-distro.patch b/2000-anolis-dotnet-add-distro.patch deleted file mode 100644 index af29d51c1aa22ecba27a5fe52b01e359b3b64aa3..0000000000000000000000000000000000000000 --- a/2000-anolis-dotnet-add-distro.patch +++ /dev/null @@ -1,234 +0,0 @@ ---- ./src/runtime.c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json 2021-10-03 23:24:08.000000000 +0800 -+++ ./src/runtime.c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json.new 2022-02-13 20:18:52.581165361 +0800 -@@ -662,6 +662,61 @@ - "rhel.8-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" -+ ] -+ }, -+ "anolis.8.5": { -+ "#import": [ -+ "anolis.8" -+ ] -+ }, -+ "anolis.8.5-arm64": { -+ "#import": [ -+ "anolis.8.5", -+ "anolis.8-arm64" -+ ] -+ }, -+ "anolis.8.5-x64": { -+ "#import": [ -+ "anolis.8.5", -+ "anolis.8-x64" -+ ] -+ }, - "centos.9": { - "#import": [ - "centos", -@@ -3657,4 +3712,4 @@ - ] - } - } --} -\ No newline at end of file -+} ---- ./src/runtime.c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json 2021-10-03 23:24:08.000000000 +0800 -+++ ./src/runtime.c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json.new 2022-02-13 20:42:04.794952145 +0800 -@@ -2052,6 +2052,128 @@ - "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" -+ ], -+ "anolis.8.5": [ -+ "anolis.8.5", -+ "anolis.8", -+ "anolis", -+ "rhel.8", -+ "rhel", -+ "linux", -+ "unix", -+ "any", -+ "base" -+ ], -+ "anolis.8.5-arm64": [ -+ "anolis.8.5-arm64", -+ "anolis.8.5", -+ "anolis.8-arm64", -+ "anolis.8", -+ "anolis-arm64", -+ "anolis", -+ "rhel.8-arm64", -+ "rhel.8", -+ "rhel-arm64", -+ "rhel", -+ "linux-arm64", -+ "linux", -+ "unix-arm64", -+ "unix", -+ "any", -+ "base" -+ ], -+ "anolis.8.5-x64": [ -+ "anolis.8.5-x64", -+ "anolis.8-x64", -+ "anolis.8.5", -+ "anolis.8", -+ "anolis-x64", -+ "rhel.8-x64", -+ "anolis", -+ "rhel.8", -+ "rhel-x64", -+ "rhel", -+ "linux-x64", -+ "linux", -+ "unix-x64", -+ "unix", -+ "any", -+ "base" -+ ], -+ - "centos.9": [ - "centos.9", - "centos", -@@ -8522,4 +8644,4 @@ - "any", - "base" - ] --} -\ No newline at end of file -+} ---- ./src/runtime.c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props 2021-10-03 23:24:08.000000000 +0800 -+++ ./src/runtime.c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props.new 2022-02-12 20:37:51.705404475 +0800 -@@ -55,6 +55,14 @@ - true - false - -+ -+ rhel -+ x64;arm64 -+ 8;9 -+ true -+ false -+ -+ - - - linux -@@ -278,6 +286,6 @@ - RuntimeJson="runtime.json" - CompatibilityMap="runtime.compatibility.json" - RuntimeDirectedGraph="$(OutputPath)runtime.json.dgml" -- UpdateRuntimeFiles="$(UpdateRuntimeFiles)" /> -+ UpdateRuntimeFiles="true" /> - - diff --git a/dotnet6.0.spec b/dotnet6.0.spec index c81a8fc05dd1ebb96b929245e0c3ea642906d510..72969be062535ee7f58ec31532a1a69e867b2e40 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -1,6 +1,4 @@ %bcond_with bootstrap -%define anolis_os_version %(source /etc/os-release; echo ${VERSION}) -%define anolis_release .0.1 # Avoid provides/requires from private libraries %global privlibs libhostfxr @@ -22,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.3 -%global runtime_version 6.0.3 +%global host_version 6.0.4 +%global runtime_version 6.0.4 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.103 +%global sdk_version 6.0.104 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -58,12 +56,11 @@ %global runtime_arch s390x %endif -%global runtime_id anolis.%{anolis_os_version}-%{runtime_arch} %{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}} Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 4%{anolis_release}%{?dist} +Release: 1%{?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/ @@ -131,8 +128,6 @@ Patch1501: sdk-22373-portablerid.patch # https://github.com/dotnet/installer/pull/12516 Patch1600: installer-12516-portablerid.patch -Patch2000: 2000-anolis-dotnet-add-distro.patch - %if 0%{?fedora} || 0%{?rhel} >= 8 ExclusiveArch: aarch64 x86_64 s390x @@ -467,8 +462,6 @@ pushd src/installer.* %patch1600 -p1 popd -%patch2000 -p0 - # Disable package validation which breaks our build, even though we # are injecting "blessed" nuget packages produced by Microsoft. # There's no need to run validation in RPM packages anyway. @@ -658,8 +651,9 @@ echo "Testing build results for debug symbols..." %changelog -* Fri Mar 11 2022 Liwei Ge - 6.0.103-4.0.1 -- Fix sdk suffix for Anolis OS +* Fri Apr 08 2022 Omair Majid - 6.0.104-1 +- Update to .NET SDK 6.0.104 and Runtime 6.0.4 +- Resolves: RHBZ#2073446 * Mon Mar 07 2022 Omair Majid - 6.0.103-4 - Rebuild against .NET 6.0.102 to pick up the correct fixes diff --git a/download b/download index fab2e18037b95b28d87065a1fe7e28518f225d9f..87a25966dfceaf214e98392982915b49112054a8 100644 --- a/download +++ b/download @@ -1 +1 @@ -888e166d5b5b248976874a6a159ff6b3 dotnet-v6.0.103-SDK.tar.gz +125a752d806ee1388f53efa6255c3f55 dotnet-v6.0.104-SDK.tar.gz