From 8fc8ca25cdedba375c6cb78edd3cc18318e9ce53 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 14 2022 08:56:02 +0000 Subject: import dotnet6.0-6.0.112-1.el9_1 --- diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index 1238f29..f033b10 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -0a579bbbae526f8ab90b57f7e365060d9bf9c527 SOURCES/dotnet-v6.0.109.tar.gz +3f58ee721f0b8bc3ddb112aa923cf5229f08c5d1 SOURCES/dotnet-v6.0.112.tar.gz diff --git a/.gitignore b/.gitignore index 8052bb8..6a51dd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.109.tar.gz +SOURCES/dotnet-v6.0.112.tar.gz diff --git a/SOURCES/installer-12516-portablerid.patch b/SOURCES/installer-12516-portablerid.patch deleted file mode 100644 index 4cb4ab6..0000000 --- a/SOURCES/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/runtime-66594-s390x-debuginfo.patch b/SOURCES/runtime-66594-s390x-debuginfo.patch deleted file mode 100644 index 5637645..0000000 --- a/SOURCES/runtime-66594-s390x-debuginfo.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/mono/mono.proj b/src/mono/mono.proj -index fb98ffc1896..d6a0c9a8ec2 100644 ---- a/src/mono/mono.proj -+++ b/src/mono/mono.proj -@@ -519,17 +519,17 @@ - - <_Objcopy Condition="'$(_ObjcopyFound)' != '0'">objcopy - -- -+ - - - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - - diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index 5d153eb..afc4798 100644 --- a/SPECS/dotnet6.0.spec +++ b/SPECS/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.9 -%global runtime_version 6.0.9 +%global host_version 6.0.12 +%global runtime_version 6.0.12 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.109 +%global sdk_version 6.0.112 %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: 3%{?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/ @@ -86,8 +86,6 @@ Source11: dotnet.sh.in Patch100: runtime-arm64-lld-fix.patch # Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315 Patch101: runtime-mono-remove-ilstrip.patch -# https://github.com/dotnet/runtime/pull/66594 -Patch102: runtime-66594-s390x-debuginfo.patch # Disable apphost, needed for s390x Patch500: fsharp-no-apphost.patch @@ -115,8 +113,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 @@ -381,7 +377,6 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/ pushd src/runtime %patch100 -p1 %patch101 -p1 -%patch102 -p1 popd pushd src/fsharp @@ -418,7 +413,6 @@ pushd src/sdk popd pushd src/installer -%patch1600 -p1 popd %if ! %{use_bundled_libunwind} @@ -618,6 +612,22 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Fri Dec 02 2022 Omair Majid - 6.0.112-1 +- Update to .NET SDK 6.0.112 and Runtime 6.0.12 +- Resolves: RHBZ#2150148 + +* 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 + +* Fri Oct 28 2022 Omair Majid - 6.0.110-1 +- Update to .NET SDK 6.0.110 and Runtime 6.0.10 +- Resolves: RHBZ#2131326 + * Tue Sep 20 2022 Omair Majid - 6.0.109-3 - Disable packages now produced by another SRPM - Related: RHBZ#2123788