From dd914f7034b71352180cea13bfeddf89efa46702 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 17 Nov 2025 23:30:35 +0000 Subject: [PATCH] import UBI dotnet10.0-10.0.100-2.el10_1 --- .gitignore | 2 +- dotnet-10.0.100.tar.gz.sig | 17 +++++++++ ...-source-10.0.100-rc.2.25502.107.tar.gz.sig | 17 --------- dotnet10.0.spec | 37 +++++++++++-------- release.json | 16 ++++---- sources | 2 +- 6 files changed, 49 insertions(+), 42 deletions(-) create mode 100644 dotnet-10.0.100.tar.gz.sig delete mode 100644 dotnet-source-10.0.100-rc.2.25502.107.tar.gz.sig diff --git a/.gitignore b/.gitignore index 2626604..a6162ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -dotnet-source-10.0.100-rc.2.25502.107.tar.gz +dotnet-10.0.100.tar.gz diff --git a/dotnet-10.0.100.tar.gz.sig b/dotnet-10.0.100.tar.gz.sig new file mode 100644 index 0000000..0c64650 --- /dev/null +++ b/dotnet-10.0.100.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: BSN Pgp v1.0.0.0 + +iQIcBAABCAAGBQJpA4ykAAoJEP2/U8JNtIcu+1YP+QHPn+Oi4DMFpm9GZKzgPBXJ +LMItN46ZT+gDT/fyO4bxWYziRxnjbDKWhGd9CU5svXBYvSFuWWolx3nHd2gRIIqE +SzSeeEZvIpaK+D1w2uP8P+9mMaqfmjwn7tyZ8YkChirSSgXaLqEKuZAWQS2ioStU +sKUeSUzE+3ZFAX+yPphiiL8vRa3hTZ0HqV1XK+RfQj35rW1YzbnPmM6DmzBpzfm9 +Bz6775l0DO2foRnjq2cJr8g5g4cf7yVxKFcwoEF9Oktx4lEvY5nfuXMNu3s2Gaf9 ++8dSPIt/cqFdF23ofYB0i1lJvM7xLxfo+p2p72wucF2G1pv2Dr1ErXXFn4Eh5ckH +7vS6oa/PVnHn780X4EIVAPsE0eHN5ef2U+SCxX8y4eWUqP9L5IDfbeDBAV4UYTxY +7PB6GCI+vyvv7iIbFAhf27k1PYj5sK4Dxv5WVPUHyBsZK2sk9DFShF5hQOdWlkqe +WfFKpJ/ljlC//BnF/AWbb0MomqekB4tqoz9rCFvQeSe/66/s0W4bWJaobtbkUjXJ +fUjHh2Fom6Ch+X/FzKoBTcsWuUQiDa+CY8dzvRhNi28l1yrxKy4JdmpuJE9zV/LQ +0qhR9JtBsgUTQ3HFW1ma7gXwZLyC5ynSijYfZ0zcUkJoi43oGHjbtN3TFf7M1WMq +/ZB8ejQzE8cwehBIiSHV +=IzTa +-----END PGP SIGNATURE----- diff --git a/dotnet-source-10.0.100-rc.2.25502.107.tar.gz.sig b/dotnet-source-10.0.100-rc.2.25502.107.tar.gz.sig deleted file mode 100644 index ce3911a..0000000 --- a/dotnet-source-10.0.100-rc.2.25502.107.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: BSN Pgp v1.0.0.0 - -iQIcBAABCAAGBQJo7rHRAAoJEP2/U8JNtIcuGdkP/1OHupLegdhs4Z00GzMtXuR+ -yxGqKlUOaFs6/cKpnytWOgeOqy3B9FWhuNorPmbvWOXNIVCEVVErKZOvb+ZDys6u -m5WHz9gmx7nGTVal5+vUYQP7qstt6dZAqXihxYfKkpQfj3z8l7WrNa2drxEFwrPZ -8xRYwl2SiT+HW7uzZ58u4sQoef/nyQQFrdZpHx3utpS3w9VfNlBiOcHhnHAvQDq7 -IxJbAkuyIOlvBhhsKBn2JVyoLD6+rjN24aEA+idfG/7J/r0myar3AoxSaqbUQXzn -c+/jyK3fwRW2fDXJkaiyScW58WXHm2NjZzNsrNvlcwJxVJtbVzBhnaoA5x+wH7As -YKJlPAQzg/qf7j6bDxFZ3rqEx9PK1pJ6Mgyq6xJ+Rb+Pc6J1yHnoDTpzdN9a2yz5 -eig3uO6ywTE9kAtZKP3zAaYlQhDE/7Iwra4e7eFMxH5QXylvngQ1Ia7tydOKkAHp -QAr9g/Kemhl4Pl4HCwOAdWU3didAOCq9qeWfQ8dIREllKXGNl+G96vtDdwTD1awY -+q4sB3aXDB3yaxUP4V2/XB3Udll+sUMv8z42B+5SVoQ+yTsZq5WtK9ogKzKY3+dB -Y4XCpg0Beh5U/Weud6osj9Rz0AN+LgshBkSIqSdr1oWyXaQcfvbd0okt5bQKfWzo -+OocMv0x7eATmAtyLeqf -=9ukX ------END PGP SIGNATURE----- diff --git a/dotnet10.0.spec b/dotnet10.0.spec index 0446cdc..ba230de 100644 --- a/dotnet10.0.spec +++ b/dotnet10.0.spec @@ -14,20 +14,20 @@ # upstream can produce releases with a different tag than the SDK version #%%global upstream_tag v%%{runtime_version} -%global upstream_tag v10.0.100-rc.2.25502.107 +%global upstream_tag v10.0.100 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%global runtime_version 10.0.0-rc.2.25502.107 -%global aspnetcore_runtime_version 10.0.0-rc.2.25502.107 -%global sdk_version 10.0.100-rc.2.25502.107 +%global runtime_version 10.0.0 +%global aspnetcore_runtime_version 10.0.0 +%global sdk_version 10.0.100 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{aspnetcore_runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') -%global runtime_rpm_version 10.0.0~rc.2.25502.107 -%global aspnetcore_runtime_rpm_version 10.0.0~rc.2.25502.107 -%global sdk_rpm_version 10.0.100~rc.2.25502.107 +%global runtime_rpm_version %{runtime_version} +%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version} +%global sdk_rpm_version %{sdk_version} %global use_bundled_brotli 0 %global use_bundled_libunwind 1 @@ -77,15 +77,14 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 0.12%{?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 URL: https://github.com/dotnet/ -#Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%%{upstream_tag}.tar.gz#/dotnet-%%{upstream_tag_without_v}.tar.gz -Source0: https://builds.dotnet.microsoft.com/dotnet/source-build/dotnet-source-%{upstream_tag_without_v}.tar.gz -Source1: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/dotnet-source-%{upstream_tag_without_v}.tar.gz.sig +Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz +Source1: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/dotnet-%{upstream_tag_without_v}.tar.gz.sig Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc Source3: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json %if %{with bootstrap} @@ -463,7 +462,7 @@ if [[ ${release_json_tag} != %{upstream_tag} ]]; then exit 1 fi -%setup -q -c -n dotnet-source-%{upstream_tag_without_v} +%setup -q -n dotnet-%{upstream_tag_without_v} # Remove all prebuilts and binaries rm -rf .dotnet/ @@ -683,7 +682,7 @@ find -depth -name 'artifacts' -type d -print -exec rm -rf {} \; ./build.sh \ --source-only \ --release-manifest %{SOURCE3} \ - --branding default \ + --branding rtm \ %if %{without bootstrap} --with-sdk previously-built-dotnet \ %endif @@ -713,9 +712,9 @@ sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE102} > dotnet.sh %install install -dm 0755 %{buildroot}%{_libdir}/dotnet -ls artifacts/assets/Release/ +find artifacts/assets/Release/ mkdir -p built-sdk -tar xf artifacts/assets/Release/Sdk/%{sdk_version}/dotnet-sdk-%{sdk_version}*-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/ +tar xf artifacts/assets/Release/dotnet-sdk-%{sdk_version}*-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/ # Delete bundled certificates: we want to use the system store only, # except for when we have no other choice and ca-certificates doesn't @@ -915,6 +914,14 @@ export COMPlus_LTTng=0 %changelog +* Wed Nov 05 2025 Omair Majid - 10.0.100-2 +- Do not include -rtm in version strings of the SDK +- Related: RHEL-125751 + +* Mon Nov 03 2025 Omair Majid - 10.0.100-1 +- Update to .NET SDK 10.0.100 and Runtime 10.0.0 +- Resolves: RHEL-125751 + * Wed Oct 15 2025 Omair Majid - 10.0.100~rc.2.25502.107-0.12 - Update to .NET SDK 10.0.100-rc.2.25502.107 and Runtime 10.0.0-rc.2.25502.107 - Resolves: RHEL-121558 diff --git a/release.json b/release.json index f5f6bd4..f22dbfb 100644 --- a/release.json +++ b/release.json @@ -1,11 +1,11 @@ { - "release": "10.0.0-rc.2", + "release": "10.0.0", "channel": "10.0", - "tag": "v10.0.100-rc.2.25502.107", - "sdkVersion": "10.0.100-rc.2.25502.107", - "runtimeVersion": "10.0.0-rc.2.25502.107", - "aspNetCoreVersion": "10.0.0-rc.2.25502.107", + "tag": "v10.0.100", + "sdkVersion": "10.0.100", + "runtimeVersion": "10.0.0", + "aspNetCoreVersion": "10.0.0", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "89c8f6a112d37d2ea8b77821e56d170a1bccdc5a", - "officialBuildId": "20251002.7" -} \ No newline at end of file + "sourceVersion": "b0f34d51fccc69fd334253924abd8d6853fad7aa", + "officialBuildId": "20251023.11" +} diff --git a/sources b/sources index af8210c..11cf991 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-source-10.0.100-rc.2.25502.107.tar.gz) = eefa03f6e409274c3d5a29317c6e26badb991019bc9c8faa2172b7ead937032bf8829474da4dc5badfb92d33e2140c6d0121f8f996c8ec146f9efddc9b2770ca +SHA512 (dotnet-10.0.100.tar.gz) = 0c292fe98c9c60864be176829011384542e94625e0969007f198df9a520aab68517a8a807927c25e885915597f3d87ffc8c1ba797606d5896f305705f3c44c98