From b7ed5b71f77c79251d311c731878af86b69077e5 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 5 Apr 2023 16:15:16 +0300 Subject: [PATCH] import dotnet6.0-6.0.110-1.el9_0 --- .dotnet6.0.metadata | 2 +- .gitignore | 2 +- SOURCES/check-debug-symbols.py | 2 +- SPECS/dotnet6.0.spec | 100 +++++++++++++++++---------------- 4 files changed, 56 insertions(+), 50 deletions(-) diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index 1238f29..6880118 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -0a579bbbae526f8ab90b57f7e365060d9bf9c527 SOURCES/dotnet-v6.0.109.tar.gz +cbf23fd9a8c5392230ddd687320e7a74232e3b3c SOURCES/dotnet-v6.0.110.tar.gz diff --git a/.gitignore b/.gitignore index 8052bb8..0e97296 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.109.tar.gz +SOURCES/dotnet-v6.0.110.tar.gz diff --git a/SOURCES/check-debug-symbols.py b/SOURCES/check-debug-symbols.py index b873c77..53d5fd2 100755 --- a/SOURCES/check-debug-symbols.py +++ b/SOURCES/check-debug-symbols.py @@ -65,7 +65,7 @@ def scan_file(file): def is_elf(file): result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True) - return re.search('ELF 64-bit LSB (?:pie )(?:executable|shared object)', result.stdout) + return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout) def scan_file_if_sensible(file): if is_elf(file): diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index 8088fab..5977c6f 100644 --- a/SPECS/dotnet6.0.spec +++ b/SPECS/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.9 -%global runtime_version 6.0.9 +%global host_version 6.0.10 +%global runtime_version 6.0.10 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.109 +%global sdk_version 6.0.110 %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 }') @@ -60,7 +60,7 @@ Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 3%{?dist} +Release: 1%{?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/ @@ -320,7 +320,7 @@ applications using the .NET SDK. %dotnet_targeting_pack dotnet-apphost-pack-6.0 %{runtime_rpm_version} Microsoft.NETCore.App 6.0 Microsoft.NETCore.App.Host.%{runtime_id} %dotnet_targeting_pack dotnet-targeting-pack-6.0 %{runtime_rpm_version} Microsoft.NETCore.App 6.0 Microsoft.NETCore.App.Ref %dotnet_targeting_pack aspnetcore-targeting-pack-6.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 6.0 Microsoft.AspNetCore.App.Ref -#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref +%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref %package -n dotnet-sdk-6.0-source-built-artifacts @@ -481,7 +481,7 @@ export COMPlus_LTTng=0 export OPENSSL_ENABLE_SHA1_SIGNATURES=1 %endif -CheckEolTargetFramework=false VERBOSE=1 ./build.sh \ +VERBOSE=1 ./build.sh \ %if %{without bootstrap} --with-sdk previously-built-dotnet \ %endif @@ -507,6 +507,7 @@ tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id} find %{buildroot}%{_libdir}/dotnet/ -type f -name 'testhost.x86' -delete find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete +# Install managed symbols # Install managed symbols: disabled because they don't contain sources # but point to the paths the sources would have been at in the build # servers. The end user experience is pretty bad atm. @@ -528,33 +529,28 @@ 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 {} \; -# Provided by dotnet-host from another SRPM -#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/ -#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/ +install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ +install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ -# Provided by dotnet-host from another SRPM -#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions +install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions # dynamic completion needs the file to be named the same as the base command -#install src/sdk/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet +install src/sdk/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet # TODO: the zsh completion script needs to be ported to use #compdef #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions #install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet -# Provided by dotnet-host from another SRPM -#install -dm 0755 %%{buildroot}%%{_bindir} -#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/ +install -dm 0755 %{buildroot}%{_bindir} +ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/ -# Provided by dotnet-host from another SRPM -#install -dm 0755 %%{buildroot}%%{_mandir}/man1/ -#find -iname 'dotnet*.1' -type f -exec cp {} %%{buildroot}%%{_mandir}/man1/ \; +install -dm 0755 %{buildroot}%{_mandir}/man1/ +find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \; -# Provided by dotnet-host from another SRPM -#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet -#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/ +install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet +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/ 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/ @@ -569,7 +565,8 @@ test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/ echo "Testing build results for debug symbols..." %{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/ -# Self-check + +%check %if 0%{?fedora} > 35 # lttng in Fedora > 35 is incompatible with .NET export COMPlus_LTTng=0 @@ -578,13 +575,21 @@ export COMPlus_LTTng=0 %{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 +%files -n dotnet-host +%dir %{_libdir}/dotnet +%{_libdir}/dotnet/dotnet +%dir %{_libdir}/dotnet/host +%dir %{_libdir}/dotnet/host/fxr +%{_bindir}/dotnet +%license %{_libdir}/dotnet/LICENSE.txt +%license %{_libdir}/dotnet/ThirdPartyNotices.txt +%doc %{_mandir}/man1/dotnet*.1.gz +%config(noreplace) %{_sysconfdir}/profile.d/dotnet.sh +%config(noreplace) %{_sysconfdir}/dotnet +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/dotnet %files -n dotnet-hostfxr-6.0 %dir %{_libdir}/dotnet/host/fxr @@ -621,37 +626,38 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 * Wed Mar 15 2023 MSVSphere Packaging Team - 6.0.109-3 - Rebuilt for MSVSphere 9.1. -* Tue Sep 20 2022 Omair Majid - 6.0.109-3 -- Disable packages now produced by another SRPM -- Related: RHBZ#2123788 +* Fri Sep 30 2022 Omair Majid - 6.0.110-1 +- Update to .NET SDK 6.0.110 and Runtime 6.0.10 +- Resolves: RHBZ#2131328 -* Wed Sep 14 2022 Omair Majid - 6.0.109-2 +* Fri Sep 02 2022 Omair Majid - 6.0.109-1 - Update to .NET SDK 6.0.109 and Runtime 6.0.9 -- Resolves: RHBZ#2123788 +- Resolves: RHBZ#2123791 -* Tue Aug 09 2022 Omair Majid - 6.0.108-1 +* Fri Jul 29 2022 Omair Majid - 6.0.108-1 - Update to .NET SDK 6.0.108 and Runtime 6.0.8 -- Resolves: RHBZ#2112409 +- Resolves: RHBZ#2112413 -* Thu Jul 21 2022 Omair Majid - 6.0.107-2 +* Fri Jul 15 2022 Andrew Slice - 6.0.107-1 - Update to .NET SDK 6.0.107 and Runtime 6.0.7 - Resolves: RHBZ#2103269 -* Thu Jun 23 2022 Omair Majid - 6.0.106-1 +* Mon Jun 06 2022 Omair Majid - 6.0.106-1 - Update to .NET SDK 6.0.106 and Runtime 6.0.6 -- Resolves: RHBZ#2093431 +- Resolves: RHBZ#2093433 -* Wed May 25 2022 Omair Majid - 6.0.105-1 +* Mon May 09 2022 Omair Majid - 6.0.105-1 - Update to .NET SDK 6.0.105 and Runtime 6.0.5 -- Resolves: RHBZ#2082266 +- Resolves: RHBZ#2082268 -* Sat Apr 30 2022 Omair Majid - 6.0.104-1 +* Tue May 03 2022 Omair Majid - 6.0.104-1 - Update to .NET SDK 6.0.104 and Runtime 6.0.4 -- Resolves: RHBZ#2078604 +- Resolves: RHBZ#2080460 -* Mon Apr 25 2022 Omair Majid - 6.0.103-2 +* Mon Apr 04 2022 Omair Majid - 6.0.103-1 - Update to .NET SDK 6.0.103 and Runtime 6.0.3 -- Resolves: RHBZ#2072015 +- Sync with RHEL 8 +- Resolves: RHBZ#2071808 * Tue Feb 15 2022 Omair Majid - 6.0.102-3 - Disable bootstrap