diff --git a/.gitignore b/.gitignore index abbb92f..4121fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /dotnet-v6.0.108.tar.gz /dotnet-v6.0.109.tar.gz /dotnet-v6.0.110.tar.gz +/dotnet-v6.0.111.tar.gz diff --git a/dotnet6.0.spec b/dotnet6.0.spec index 06b19fe..7f21c2e 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -20,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.10 -%global runtime_version 6.0.10 +%global host_version 6.0.11 +%global runtime_version 6.0.11 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.110 +%global sdk_version 6.0.111 %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 }') @@ -60,7 +60,7 @@ Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 2%{?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/ @@ -119,8 +119,6 @@ Patch1500: sdk-telemetry-optout.patch # https://github.com/dotnet/sdk/pull/22373 Patch1501: sdk-22373-portablerid.patch -# https://github.com/dotnet/installer/pull/12516 -Patch1600: installer-12516-portablerid.patch %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -424,7 +422,6 @@ pushd src/sdk popd pushd src/installer -%patch1600 -p1 popd %if ! %{use_bundled_libunwind} @@ -624,6 +621,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Wed Nov 09 2022 Omair Majid - 6.0.111-1 +- Update to .NET SDK 6.0.111 and Runtime 6.0.11 +- Resolves: RHBZ#2138278 + * Tue Nov 08 2022 Omair Majid - 6.0.110-2 - Fix build with newer versions of clang - Related: RHBZ#2131326 diff --git a/installer-12516-portablerid.patch b/installer-12516-portablerid.patch deleted file mode 100644 index 4cb4ab6..0000000 --- a/installer-12516-portablerid.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 892222071f73062f969f4f6ed1df8f759b9327b7 Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Wed, 3 Nov 2021 15:12:59 +0100 -Subject: [PATCH] GetRuntimeInformation.targets: determine - PortableProductMonikerRid based on HostOSName and Architecture. - ---- - src/redist/targets/GetRuntimeInformation.targets | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets -index 5133c3a3841..01f704c7d8e 100644 ---- a/src/redist/targets/GetRuntimeInformation.targets -+++ b/src/redist/targets/GetRuntimeInformation.targets -@@ -28,6 +28,8 @@ - '$(Rid)' == 'linux-musl-x64' ">$(Rid) - $(OSName)-$(Architecture) - -+ $(HostOSName)-$(Architecture) -+ - dotnet-sdk-internal$(PgoTerm) - dotnet-sdk$(PgoTerm) - diff --git a/sources b/sources index 083a7b9..95cbf33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v6.0.110.tar.gz) = 756c5ccff3855841949724a41e4312a80324adc96dd1b4422f78f0a17fb166264e87554215e249d41b2735ee4d1f40cee86dd5847289bf2882d1f9533b3c64c8 +SHA512 (dotnet-v6.0.111.tar.gz) = 68c51d86d7669470661865d3d72f1705ecd43243319d12e042faf5ed0327f4eb6bc9411a58ac18a8df035869dc9de2999a7c1dc5c59e9d67e0aa8e63ad2dacd4