From e8113e86b1fc242c435162939fc9b6e6db8f10ba Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 12 Dec 2023 17:26:02 -0500 Subject: [PATCH] Update to .NET SDK 6.0.125 and Runtime 6.0.25 Resolves: RHEL-15349 --- .gitignore | 1 + dotnet6.0.spec | 10 +++++--- sources | 2 +- update-release | 62 +++++++++++++++++++++++++++++++++----------------- 4 files changed, 50 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 4b168cf..3fdb970 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /dotnet-v6.0.122.tar.gz /dotnet-v6.0.123.tar.gz /dotnet-v6.0.124.tar.gz +/dotnet-v6.0.125.tar.gz diff --git a/dotnet6.0.spec b/dotnet6.0.spec index bb9aa5b..3a9bf5d 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.24 -%global runtime_version 6.0.24 +%global host_version 6.0.25 +%global runtime_version 6.0.25 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.124 +%global sdk_version 6.0.125 %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 }') @@ -609,6 +609,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Mon Dec 11 2023 Omair Majid - 6.0.125-2 +- Update to .NET SDK 6.0.125 and Runtime 6.0.25 +- Resolves: RHEL-15349 + * Tue Oct 24 2023 Omair Majid - 6.0.124-2 - Update to .NET SDK 6.0.124 and Runtime 6.0.24 - Resolves: RHEL-14462 diff --git a/sources b/sources index 1e339d3..985fe93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v6.0.124.tar.gz) = 0e7a4c14b2bfab79ebe6c4cfeb980624fcef552682449a42a44631d12f31930fa5765384a6b8d1ad16924f3982ae854224afad684f7fb3509c6a7f7ad8585601 +SHA512 (dotnet-v6.0.125.tar.gz) = cecf6bfa377dc8c99e080d2ba10325608224282996bac6ff624ed89173a70570421a1bcdebf425c2cf095b091bde12563d7f6cd716bd77979ccd7211a9a5bb94 diff --git a/update-release b/update-release index 3e02e9c..5725315 100755 --- a/update-release +++ b/update-release @@ -8,7 +8,7 @@ IFS=$'\n\t' print_usage() { echo " Usage:" - echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release]" + echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]" } user_provided_tarball_name="" @@ -28,6 +28,11 @@ while [[ "$#" -gt 0 ]]; do print_usage exit 0 ;; + --release-json) + release_json="$2" + shift; + shift; + ;; --tarball) user_provided_tarball_name="$2" shift; @@ -61,28 +66,10 @@ fi host_version="$runtime_version" -if [[ "$runtime_version" == "3.1"* ]]; then - tag=v${sdk_version}-SDK -else +if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then tag=v${sdk_version} -fi - -if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then - echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball" else - if [[ -n "${user_provided_tarball_name}" ]]; then - cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then - cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then - cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then - cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" - fi -fi - -if [[ ! -f "dotnet-${tag}.tar.gz" ]]; then - ./build-dotnet-tarball "${tag}" + tag=v${runtime_version} fi set -x @@ -91,6 +78,39 @@ sed -i -E "s|^%global host_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%globa sed -i -E "s|^%global runtime_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global runtime_version ${runtime_version}|" "$spec_file" sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:]][[:digit:]]|%global sdk_version ${sdk_version}|" "$spec_file" + +if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then + if [[ -f "dotnet-${tag}.tar.gz" ]]; then + echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" + else + if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then + echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball" + else + if [[ -n "${user_provided_tarball_name}" ]]; then + cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" + elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then + cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" + elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then + cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" + elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then + cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" + fi + fi + + ./build-dotnet-tarball "${tag}" + fi +else + if [[ -f "dotnet-${tag}.tar.gz" ]]; then + echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" + elif [[ -n ${user_provided_tarball_name} ]]; then + cp -a "${user_provided_tarball_name}" "dotnet-${tag}.tar.gz" + cp -a "${release_json}" release.json + else + rm -f release.json + spectool -g "$spec_file" + fi +fi + comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}" commit_message="$comment "