import dotnet6.0-6.0.118-1.0.1.el8_8

.dotnet6.0.metadata

@@ -1 +1 @@
-a71648c62e5f955911ccc8530d43fc396b656f15 SOURCES/dotnet-v6.0.116.tar.gz
+81df4bcfffa6a022df2da2e2c9d3fb488a127671 SOURCES/dotnet-v6.0.118.tar.gz

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.16
-%global runtime_version 6.0.16
+%global host_version 6.0.18
+%global runtime_version 6.0.18
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.116
+%global sdk_version 6.0.118
 %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 }')
@@ -56,11 +56,11 @@
 %global runtime_arch s390x
 %endif
 
-%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}}
+%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID}")-%{runtime_arch}}
 
 Name:           dotnet6.0
 Version:        %{sdk_rpm_version}
-Release:        2%{?dist}
+Release:        1.0.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/
@@ -113,6 +113,9 @@ Patch1001:      msbuild-no-systemconfiguration.patch
 Patch1500:      sdk-telemetry-optout.patch
 
 
+# Oracle patches
+Patch10000:     10000-Add-missing-OL-Runtime-IDs.patch
+
 %if 0%{?fedora} || 0%{?rhel} >= 8
 ExclusiveArch:  aarch64 x86_64 s390x
 %else
@@ -427,6 +430,9 @@ pushd src/sdk
 %patch1500 -p1
 popd
 
+# Oracle patches
+%patch10000 -p1
+
 pushd src/installer
 popd
 
@@ -612,6 +618,17 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
 
 
 %changelog
+* Wed Jun 14 2023 EL Errata <el-errata_ww@oracle.com> - 6.0.118-1.0.1
+- Add missing Oracle Linux Runtime IDs
+
+* Thu Jun 01 2023 Andrew Slice <andrew.slice@redhat.com> - 6.0.118-1
+- Update to .NET SDK 6.0.118 and Runtime 6.0.18
+- Resolves: RHBZ#2212378
+
+* Thu May 04 2023 Omair Majid <omajid@redhat.com> - 6.0.117-2
+- Update to .NET SDK 6.0.117 and Runtime 6.0.17
+- Resolves: RHBZ#2190262
+
 * Wed Apr 12 2023 Omair Majid <omajid@redhat.com> - 6.0.116-2
 - Update to .NET SDK 6.0.116 and Runtime 6.0.16
 - Resolves: RHBZ#2183580