Debrand

SPECS/dotnet6.0.spec

@@ -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:        1.0.1%{?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/
@@ -113,9 +113,6 @@ 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
@@ -430,9 +427,6 @@ pushd src/sdk
 %patch1500 -p1
 popd
 
-# Oracle patches
-%patch10000 -p1
-
 pushd src/installer
 popd
 
@@ -618,9 +612,6 @@ 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