Update to .NET SDK 7.0.112 and Runtime 7.0.12
Remove subpackages provided by .NET 8. Resolves: RHEL-11698
This commit is contained in:
Omair Majid
parent
b8bdddf8a3
commit
c5ed5646d7
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,3 +18,4 @@
|
||||
/dotnet-v7.0.109.tar.gz
|
||||
/dotnet-v7.0.110.tar.gz
|
||||
/dotnet-v7.0.111.tar.gz
|
||||
/dotnet-v7.0.112.tar.gz
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
# until that's done, disable LTO. This has to happen before setting the flags below.
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
%global host_version 7.0.11
|
||||
%global runtime_version 7.0.11
|
||||
%global host_version 7.0.12
|
||||
%global runtime_version 7.0.12
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 7.0.111
|
||||
%global sdk_version 7.0.112
|
||||
%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 }')
|
||||
@ -323,7 +323,7 @@ applications using the .NET SDK.
|
||||
%dotnet_targeting_pack dotnet-apphost-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Host.%{runtime_id}
|
||||
%dotnet_targeting_pack dotnet-targeting-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Ref
|
||||
%dotnet_targeting_pack aspnetcore-targeting-pack-7.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 7.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-7.0-source-built-artifacts
|
||||
@ -515,30 +515,35 @@ 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 {} \;
|
||||
|
||||
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}%%{_sysconfdir}/profile.d/
|
||||
#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/
|
||||
|
||||
install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
|
||||
# Provided by dotnet-host from another SRPM
|
||||
#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
|
||||
|
||||
install -dm 0755 %{buildroot}%{_bindir}
|
||||
ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
|
||||
# Provided by dotnet-host from another SRPM
|
||||
#install -dm 0755 %%{buildroot}%%{_bindir}
|
||||
#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/
|
||||
|
||||
for section in 1 7; do
|
||||
install -dm 0755 %{buildroot}%{_mandir}/man${section}/
|
||||
find -iname 'dotnet*'.${section} -type f -exec cp {} %{buildroot}%{_mandir}/man${section}/ \;
|
||||
done
|
||||
# Provided by dotnet-host from another SRPM
|
||||
#for section in 1 7; do
|
||||
# install -dm 0755 %%{buildroot}%%{_mandir}/man${section}/
|
||||
# find -iname 'dotnet*'.${section} -type f -exec cp {} %%{buildroot}%%{_mandir}/man${section}/ \;
|
||||
#done
|
||||
|
||||
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/
|
||||
# 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}%{_libdir}/dotnet/source-built-artifacts
|
||||
install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
|
||||
@ -554,8 +559,7 @@ echo "Testing build results for debug symbols..."
|
||||
%{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/
|
||||
|
||||
|
||||
|
||||
%check
|
||||
# Self-check
|
||||
%if 0%{?fedora} > 35
|
||||
# lttng in Fedora > 35 is incompatible with .NET
|
||||
export COMPlus_LTTng=0
|
||||
@ -564,27 +568,14 @@ 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
|
||||
|
||||
%if 0%{?rhel} <= 8
|
||||
%files -n dotnet
|
||||
# empty package useful for dependencies
|
||||
%endif
|
||||
# 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
|
||||
%doc %{_mandir}/man7/dotnet*.7.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-7.0
|
||||
%dir %{_libdir}/dotnet/host/fxr
|
||||
@ -618,6 +609,10 @@ export COMPlus_LTTng=0
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 7.0.112-2
|
||||
- Update to .NET SDK 7.0.112 and Runtime 7.0.12
|
||||
- Resolves: RHEL-11698
|
||||
|
||||
* Tue Sep 12 2023 Omair Majid <omajid@redhat.com> - 7.0.111-2
|
||||
- Update to .NET SDK 7.0.111 and Runtime 7.0.11
|
||||
- Resolves: RHEL-2000
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (dotnet-v7.0.111.tar.gz) = 3cb62adf8d723aacfbac1917e08b6141c91f34b78cbff570f1551ef502eb1f6e92f9793abddbb6a337f355f08c9f3fd00724765d72d25e3e2b558013714371d9
|
||||
SHA512 (dotnet-v7.0.112.tar.gz) = e0b795e026ac049d0335a944f3a7ef9d521fae8ef147a651d8e918db0b25171711000a7767e56bb57e12a722682f4d9db0604a868c67f38a23c7a9df9984afdd
|
||||
|
||||
@ -95,7 +95,7 @@ comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"
|
||||
commit_message="$comment
|
||||
"
|
||||
for bug_id in "${bug_ids[@]}"; do
|
||||
if [[ $bug =~ ^[[:digit:]]+$ ]]; then
|
||||
if [[ "$bug_id" =~ ^[[:digit:]]+$ ]]; then
|
||||
comment="$comment
|
||||
- Resolves: RHBZ#$bug_id"
|
||||
commit_message="$commit_message
|
||||
|
||||
Loading…
Reference in New Issue
Block a user