From 8ab592c47dd089c4505e900a476e4a674c10bc63 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 13 Nov 2024 18:30:45 +0000 Subject: [PATCH] import UBI dotnet8.0-8.0.111-1.el8_10.1 --- .dotnet8.0.metadata | 2 +- .gitignore | 2 +- SOURCES/dotnet-8.0.10.tar.gz.sig | 17 ------------ SOURCES/dotnet-8.0.11.tar.gz.sig | 17 ++++++++++++ SOURCES/release.json | 12 ++++---- SPECS/dotnet8.0.spec | 47 ++++++++++++++++++++++++++++---- 6 files changed, 66 insertions(+), 31 deletions(-) delete mode 100644 SOURCES/dotnet-8.0.10.tar.gz.sig create mode 100644 SOURCES/dotnet-8.0.11.tar.gz.sig diff --git a/.dotnet8.0.metadata b/.dotnet8.0.metadata index 93cab2c..9795429 100644 --- a/.dotnet8.0.metadata +++ b/.dotnet8.0.metadata @@ -1 +1 @@ -9534f1423e747a10592e936b23c1bd3252839d32 SOURCES/dotnet-8.0.10.tar.gz +d3b76ac1e5b8828271f3974d698375eaff1fd002 SOURCES/dotnet-8.0.11.tar.gz diff --git a/.gitignore b/.gitignore index 456a63b..1d501bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-8.0.10.tar.gz +SOURCES/dotnet-8.0.11.tar.gz diff --git a/SOURCES/dotnet-8.0.10.tar.gz.sig b/SOURCES/dotnet-8.0.10.tar.gz.sig deleted file mode 100644 index c03c133..0000000 --- a/SOURCES/dotnet-8.0.10.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: BSN Pgp v1.0.0.0 - -iQIcBAABCAAGBQJm9YvqAAoJEP2/U8JNtIcu6scP/1NUeH4nzCOGabEmrPz2mKzN -MJY4g9UhlE/Yxa2ky1gcUr3lZ01Qmk5ZOCwNrUy2/GQksTJb1xOk6PRW1kjQ2yVq -9z8uCEoP7H1odxa2bN9EkMGcdm63jinlYPL/sCDe6zUzVFkYXU987R24RubtiUJG -a6zs+Td0vMQi9JHAtK/eZ37OM7DJ0/mCVaf+NvBQVEBDNIEv4lCqQigJnMqaD0Dw -+JuUDSRNU6fIzWbx79EYp/dz4izdwuYCvFoh7/lHNk/fSlPqV26HLGeUs3CYR5MD -DfL78KY2cvwNKrxr96UX6T7GOEu3Vvs1dK1vEe+lcuINVGfi8CwTMNUBoEtmecvd -Bv6OXzjBldG+zPV/k7mnvMZdWmvH2c3c61tpO96OmZE1B6IePuhN1NiaFtSHwec+ -GwZJ7yD7dB1NBP4t93M6bTSgKi8rCvopaS4R1IGh5KMaUgvDbTrtF1veAdmoeiry -hVvRIXRFhFSM6cN1clZw1QaKpx/a1jw5wt7HbWxujfvRhvzVPtVyDoap2BUQUvnS -bbcrmR8t+XOyaa0UneoJwZMTymoFQgPjMAyeOpnsXKU/N9D7ncsHEide0Fg/xiBr -opX0CSpvI9BEzw6jFtM86bTDhm1TEsLZb/OKmHdweilCrgbfcD6r5is/6dUEsk+d -Y6SlXFys4bAUe5bBXI1o -=Bshk ------END PGP SIGNATURE----- diff --git a/SOURCES/dotnet-8.0.11.tar.gz.sig b/SOURCES/dotnet-8.0.11.tar.gz.sig new file mode 100644 index 0000000..30567b1 --- /dev/null +++ b/SOURCES/dotnet-8.0.11.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: BSN Pgp v1.0.0.0 + +iQIcBAABCAAGBQJnIVMuAAoJEP2/U8JNtIcuXR8QAJzyJ8IU1ISf5SSLCMMIb8l6 +jWxaAyqt85qGKO+sN4YGGjDrcwHxDFHvTilRWQU7E+VngK7Xem9uLZBd5295JgjO +27QyUtP2Qg52ReJMO0TiH89CsUiI6IiQmj9nD+kNQqMoIUAZSf0lGB1tjkQZLUIB +A2PtfaBJOxIzN3QD6JM/hpvvh3h1vsR6mEbTf7hMZaGDleHEc5BAvBYh4iouF+1T +aU6IO1Pk708WwqK4ZVd7h6AVnXj9T7GN0N2r82B/bDWcpWzaUPstJ8IlQjF4n+RI +vglF4d2iC2V3Bht1/00SSdYxXokEOv0tYGDB4P0QncWs2q6PScfND89pCvo/dRE5 +5DqWadAb3/uOjKBtUpZW/mb3IAa8kKMTQ/yea9pNVbpg/VSNHdsWhRIsP5SneeWY +hoFJ2zAqlXunGN5lFfCTZcOKaaT2ar0nKoj8bNhtO+DimkY8FNAngCOdUcPnvGlx +p4NFOlavl+Vl3mj+zBwyj4/BH3RVTpLlVbKRCHAijAc8rzhUEz8dwKCKLnbhDv0Q +m95RvTSimPTHyAGUcz5dNaoWJuEZPnWiT/7lsGv9CQxUSGdO+z9GRyjDR/mT+R9V +8T6WHcJ8QDNGoZL4LFjCGvg8jIuOandsOAzmcWk+a+e1T3tyALfRrw7hNAvF50q0 +ZnvRAszWXwj5FDLYSjCU +=t1Qe +-----END PGP SIGNATURE----- diff --git a/SOURCES/release.json b/SOURCES/release.json index 501d01c..6c2c717 100644 --- a/SOURCES/release.json +++ b/SOURCES/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.10", + "release": "8.0.11", "channel": "8.0", - "tag": "v8.0.10", - "sdkVersion": "8.0.110", - "runtimeVersion": "8.0.10", - "aspNetCoreVersion": "8.0.10", + "tag": "v8.0.11", + "sdkVersion": "8.0.111", + "runtimeVersion": "8.0.11", + "aspNetCoreVersion": "8.0.11", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "8922fe64a1903ed4e35e24568efb056b3e0fad43" + "sourceVersion": "d5f3d652f9266d600777f626a9650a273419859b" } diff --git a/SPECS/dotnet8.0.spec b/SPECS/dotnet8.0.spec index b177f8d..78ca280 100644 --- a/SPECS/dotnet8.0.spec +++ b/SPECS/dotnet8.0.spec @@ -8,10 +8,14 @@ %global dotnetver 8.0 -%global host_version 8.0.10 -%global runtime_version 8.0.10 +# Only the package for the latest dotnet version should provide RPMs like +# dotnet-host and netstandard-targeting-pack-2.1 +%global is_latest_dotnet 0 + +%global host_version 8.0.11 +%global runtime_version 8.0.11 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 8.0.110 +%global sdk_version 8.0.111 %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 }') @@ -54,7 +58,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 1%{?dist} +Release: 1%{?dist}.1 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 @@ -386,7 +390,9 @@ applications using the .NET SDK. %dotnet_targeting_pack dotnet-apphost-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Host.%{runtime_id} %dotnet_targeting_pack dotnet-targeting-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Ref %dotnet_targeting_pack aspnetcore-targeting-pack-%{dotnetver} %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App %{dotnetver} Microsoft.AspNetCore.App.Ref +%if %{is_latest_dotnet} %dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref +%endif %package -n dotnet-sdk-%{dotnetver}-source-built-artifacts @@ -528,7 +534,8 @@ export EXTRA_LDFLAGS="$LDFLAGS" # suggested compile-time change doesn't work, unfortunately. export COMPlus_LTTng=0 -VERBOSE=1 ./build.sh \ +VERBOSE=1 timeout 5h \ + ./build.sh \ %if %{without bootstrap_dotnet} --with-sdk previously-built-dotnet \ %endif @@ -592,6 +599,7 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \; +%if %{is_latest_dotnet} install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ @@ -616,6 +624,7 @@ echo "%{_libdir}/dotnet" >> install_location install install_location %{buildroot}%{_sysconfdir}/dotnet/ echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch} install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ +%endif install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ @@ -639,6 +648,20 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type d | tail -n +2 | sed -E 's|%{buildr find %{buildroot}%{_libdir}/dotnet/sdk -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' >> dotnet-sdk-non-dbg-files find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-sdk-dbg-files +%if %{is_latest_dotnet} == 0 +# If this is an older version, self-test now, before we delete files. After we +# delete files, we will not have everything we need to self-test in %%check. +%{buildroot}%{_libdir}/dotnet/dotnet --info +%{buildroot}%{_libdir}/dotnet/dotnet --version + +# Provided by dotnet-host from another SRPM +rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt +rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt +rm %{buildroot}%{_libdir}/dotnet/dotnet +# Provided by netstandard-targeting-pack-2.1 from another SRPM +rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 +%endif + %check %if 0%{?fedora} > 35 @@ -646,10 +669,13 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buil export COMPlus_LTTng=0 %endif +%if %{is_latest_dotnet} %{buildroot}%{_libdir}/dotnet/dotnet --info %{buildroot}%{_libdir}/dotnet/dotnet --version +%endif +%if %{is_latest_dotnet} %if ( 0%{?fedora} && 0%{?fedora} < 38 ) || ( 0%{?rhel} && 0%{?rhel} < 9 ) %files -n dotnet # empty package useful for dependencies @@ -670,6 +696,7 @@ export COMPlus_LTTng=0 %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/dotnet +%endif %files -n dotnet-hostfxr-%{dotnetver} %dir %{_libdir}/dotnet/host/fxr @@ -712,7 +739,15 @@ export COMPlus_LTTng=0 %changelog -* Sat Sep 28 2024 Omair Majid - 8.0.110-1 +* Mon Nov 04 2024 Omair Majid - 8.0.111-1.1 +- Disable packages provided by another .NET version +- Related: RHEL-65366 + +* Thu Oct 31 2024 Omair Majid - 8.0.111-1 +- Update to .NET SDK 8.0.111 and Runtime 8.0.11 +- Resolves: RHEL-65366 + +* Tue Oct 15 2024 Omair Majid - 8.0.110-2 - Update to .NET SDK 8.0.110 and Runtime 8.0.10 - Resolves: RHEL-60794