From b0ace7c10394b72433f749f9af506234d25ffb2b Mon Sep 17 00:00:00 2001 From: "yangxiaoxuan@openanolis.org" Date: Thu, 24 Jun 2021 12:22:49 +0800 Subject: [PATCH] build: fix sdk suffix for Anolis OS Signed-off-by: yangxiaoxuan@openanolis.org (cherry picked from commit 2e4d77705d80062eb502a51bfa010864fa71b045) Signed-off-by: xzyang Conflicts: dotnet5.0.spec --- dotnet5.0.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dotnet5.0.spec b/dotnet5.0.spec index f3b00f5..17d7435 100644 --- a/dotnet5.0.spec +++ b/dotnet5.0.spec @@ -1,3 +1,5 @@ +%define anolis_os_version %(source /etc/os-release; echo ${VERSION}) +%define anolis_release .0.1 %bcond_without bootstrap # Avoid provides/requires from private libraries @@ -52,11 +54,12 @@ %global runtime_arch arm64 %endif +%global runtime_id anolis.%{anolis_os_version}-%{runtime_arch} %{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}} Name: dotnet5.0 Version: %{sdk_rpm_version} -Release: 1%{?dist} +Release: 1%{anolis_release}%{?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/ @@ -529,6 +532,10 @@ echo "Testing build results for debug symbols..." %changelog +* Wed Dec 01 2021 Ma Hailiang - 5.0.208-1.0.1 +- Fix sdk suffix for Anolis OS +- Cherry-pick [2e4d777] + * Wed Oct 06 2021 Omair Majid - 5.0.208-1 - Update to .NET SDK 5.0.208 and Runtime 5.0.11 - Resolves: RHBZ#2011060 -- Gitee