diff --git a/2000-anolis-dotnet-add-distro.patch b/2000-anolis-dotnet-add-distro.patch index 0ebc31dce716c6f508503db77065a4ac21ff3c95..59ebd939d0b6e3fe7fb7f2b7503ac7423aacd1cb 100644 --- a/2000-anolis-dotnet-add-distro.patch +++ b/2000-anolis-dotnet-add-distro.patch @@ -40,8 +40,8 @@ # We have forced __PortableBuild=0. This is because -portablebuld # has been passed as false. if (( isPortable == 0 )); then -- if [[ "${ID}" == "rhel" || "${ID}" == "alpine" ]]; then -+ if [ "${ID}" = "rhel" ] || [ "${ID}" = "anolis" ]; then +- if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then ++ if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]] || [ "${ID}" == "anolis" ]; then # remove the last version digit VERSION_ID="${VERSION_ID%.*}" fi @@ -69,12 +69,13 @@ } --- ./src/runtime/src/native/corehost/hostmisc/pal.unix.cpp 2022-05-03 01:46:23.000000000 +0800 +++ ./src/runtime/src/native/corehost/hostmisc/pal.unix.cpp.new 2022-06-09 16:32:39.621245751 +0800 -@@ -679,6 +679,7 @@ +@@ -679,7 +679,8 @@ pal::string_t normalize_linux_rid(pal::string_t rid) { pal::string_t rhelPrefix(_X("rhel.")); + pal::string_t anolisPrefix(_X("anolis.")); pal::string_t alpinePrefix(_X("alpine.")); + pal::string_t rockyPrefix(_X("rocky.")); size_t lastVersionSeparatorIndex = std::string::npos; @@ -686,6 +687,10 @@ diff --git a/dotnet6.0.spec b/dotnet6.0.spec index 0c3f6dcc446f978e6cce6c43df675d62c0c6687c..9af639845db558f08ceef27111b29ef5850534ec 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -22,10 +22,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.9 -%global runtime_version 6.0.9 +%global host_version 6.0.10 +%global runtime_version 6.0.10 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.109 +%global sdk_version 6.0.110 %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 }') @@ -36,7 +36,7 @@ %global sdk_rpm_version %{sdk_version} # upstream can update releases without revving the SDK version so these don't always match -%global upstream_tag v%{sdk_version}-SDK +%global upstream_tag v%{sdk_version} %if 0%{?fedora} || 0%{?rhel} < 8 %global use_bundled_libunwind 0 @@ -631,9 +631,13 @@ echo "Testing build results for debug symbols..." %changelog -* Fri Sep 16 2022 Liwei Ge - 6.0.109-1.0.1 +* Thu Oct 13 2022 Liwei Ge - 6.0.110-1.0.1 - Fix sdk suffix for Anolis OS +* Fri Sep 30 2022 Omair Majid - 6.0.110-1 +- Update to .NET SDK 6.0.110 and Runtime 6.0.10 +- Resolves: RHBZ#2131327 + * Fri Sep 02 2022 Omair Majid - 6.0.109-1 - Update to .NET SDK 6.0.109 and Runtime 6.0.9 - Resolves: RHBZ#2123789 diff --git a/download b/download index 62f4f925057c4dd05ee8f8135a6b73fae267e09e..7b48e0227601654183fda1f2a323959935754a2c 100644 --- a/download +++ b/download @@ -1 +1 @@ -d8cb8c537e0729b389804828e129b3a8 dotnet-v6.0.109-SDK.tar.gz +fa2b42ef39b6e430e4e8a88d776e1156 dotnet-v6.0.110.tar.gz