diff --git a/.gitignore b/.gitignore index 095a2b3..06cade9 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /dotnet-v8.0.0-rc.1.23419.4.tar.gz /dotnet-v8.0.0-rc.2.23479.6.tar.gz /dotnet-v8.0.0.tar.gz +/dotnet-v8.0.1.tar.gz diff --git a/dotnet8.0.spec b/dotnet8.0.spec index f270309..c00b3ac 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -8,16 +8,15 @@ %global dotnetver 8.0 -%global host_version 8.0.0 -%global runtime_version 8.0.0 -%global aspnetcore_runtime_version 8.0.0 -%global sdk_version 8.0.100 +%global host_version 8.0.1 +%global runtime_version 8.0.1 +%global aspnetcore_runtime_version %{runtime_version} +%global sdk_version 8.0.101 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | 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 }') -# upstream can produce releases with a different tag than the SDK version -%global upstream_tag v8.0.0 +%global upstream_tag v%{runtime_version} %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global host_rpm_version %{host_version} @@ -54,7 +53,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 3%{?dist} +Release: 2%{?dist} Summary: .NET Runtime and SDK License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib @@ -655,6 +654,10 @@ export COMPlus_LTTng=0 %changelog +* Mon Jan 15 2024 Omair Majid - 8.0.101-2 +- Update to .NET SDK 8.0.101 and Runtime 8.0.1 +- Resolves: RHEL-19803 + * Wed Nov 15 2023 Omair Majid - 8.0.100-3 - Update to .NET SDK 8.0.100 and Runtime 8.0.0 - Resolves: RHEL-15352 diff --git a/release.json b/release.json index bd833ad..4463ecb 100644 --- a/release.json +++ b/release.json @@ -1,9 +1,9 @@ { - "release": "8.0.0", + "release": "8.0.1", "channel": "8.0", - "tag": "v8.0.0", - "sdkVersion": "8.0.100", - "runtimeVersion": "8.0.0", + "tag": "v8.0.1", + "sdkVersion": "8.0.101", + "runtimeVersion": "8.0.1", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "40e7f014ff784457efffa58074549735e30772ae" + "sourceVersion": "b27976e5a6850466ee5b4ce24f91ee93bef645f7" } diff --git a/sources b/sources index 6f64121..3180100 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v8.0.0.tar.gz) = 094265462d66d97b51ebfbe5fb06d4a679b97881f1f5a07a87a282a96eeaabfe97ca42061d59aac71dd8861c07f07dda16a72e29ae03167407e51d3fd2767562 +SHA512 (dotnet-v8.0.1.tar.gz) = 8867133406eb79f906f3b7aeccf4aa72f8bd3d5af831d11bec304dc3a1b87c2eccb8176c36b404a81c34c9157a7e620eba22abaa1000226ba027d1c5f4efbe04 diff --git a/update-release b/update-release index 78d84ee..5725315 100755 --- a/update-release +++ b/update-release @@ -72,6 +72,8 @@ else tag=v${runtime_version} fi +set -x + sed -i -E "s|^%global host_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global host_version ${host_version}|" "$spec_file" 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" @@ -104,13 +106,11 @@ else cp -a "${user_provided_tarball_name}" "dotnet-${tag}.tar.gz" cp -a "${release_json}" release.json else - rm release.json + rm -f release.json spectool -g "$spec_file" fi fi -set -x - comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}" commit_message="$comment "