From 3291edde2d260e1a06ce5eab97664e8d6631243a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 6 Dec 2022 08:10:32 +0000 Subject: [PATCH] Auto sync2gitlab import of dotnet6.0-6.0.112-1.el8_7.src.rpm --- .gitignore | 1 + dotnet6.0.spec | 13 +++++++------ runtime-66594-s390x-debuginfo.patch | 29 ----------------------------- sources | 2 +- 4 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 runtime-66594-s390x-debuginfo.patch diff --git a/.gitignore b/.gitignore index 61630c5..3b6a9f6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /dotnet-v6.0.108-SDK.tar.gz /dotnet-v6.0.109.tar.gz /dotnet-v6.0.111.tar.gz +/dotnet-v6.0.112.tar.gz diff --git a/dotnet6.0.spec b/dotnet6.0.spec index afdd7c6..16bca8f 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.11 -%global runtime_version 6.0.11 +%global host_version 6.0.12 +%global runtime_version 6.0.12 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.111 +%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 }') @@ -87,8 +87,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 @@ -397,7 +395,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 @@ -617,6 +614,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Thu Dec 01 2022 Omair Majid - 6.0.112-1 +- Update to .NET SDK 6.0.112 and Runtime 6.0.12 +- Resolves: RHBZ#2150147 + * Wed Nov 02 2022 Omair Majid - 6.0.111-1 - Update to .NET SDK 6.0.111 and Runtime 6.0.11 - Resolves: RHBZ#2138277 diff --git a/runtime-66594-s390x-debuginfo.patch b/runtime-66594-s390x-debuginfo.patch deleted file mode 100644 index 5637645..0000000 --- a/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/sources b/sources index 4aeff0b..027f8b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v6.0.111.tar.gz) = 5c7484e1467ea3470d1309d191f6fed88ab8e8d02db5bc321d5ccd014cc64523ff78c33d684a1292218cb275fa9d544b991d508b7f92f468610eabf22592ba2f +SHA512 (dotnet-v6.0.112.tar.gz) = fae099a07371ba69aaa745de548246c08564611f0638b31c4e73ced04468db3cff857322d489a81526218f625cb138a386850c81c924c7c71a0d62bf1ea6e192