diff --git a/dotnet6.0.spec b/dotnet6.0.spec index ca2f5df243a45365e8a84191e2608b791b9a44a5..466295eea7ad9fd7646e08ab77b6e5999856e649 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -22,10 +22,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.18 -%global runtime_version 6.0.18 +%global host_version 6.0.20 +%global runtime_version 6.0.20 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.118 +%global sdk_version 6.0.120 %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 }') @@ -336,7 +336,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 @@ -531,32 +531,32 @@ 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/ @@ -577,12 +577,30 @@ echo "Testing build results for debug symbols..." %{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 +#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 +#rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 + +%files -n dotnet +# empty package useful for dependencies + +%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 @@ -617,8 +635,17 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog -* Thu Jun 15 2023 Liwei Ge - 6.0.118-1.0.1 +* Mon Jul 24 2023 Liwei Ge - 6.0.120-1.0.1 - Fix sdk suffix for Anolis OS +- Update netstandard-targeting-pack-2.1 acquisition method (Zhao Hang) + +* Tue Jul 04 2023 Omair Majid - 6.0.120-1 +- Update to .NET SDK 6.0.120 and Runtime 6.0.20 +- Resolves: RHBZ#2219639 + +* Tue Jun 20 2023 Omair Majid - 6.0.119-1 +- Update to .NET SDK 6.0.119 and Runtime 6.0.19 +- Resolves: RHBZ#2216221 * Thu Jun 01 2023 Andrew Slice - 6.0.118-1 - Update to .NET SDK 6.0.118 and Runtime 6.0.18 diff --git a/download b/download index bf88f0c776efdcc42eadc5d24c7db99eda26386d..325d81aa86ad673d07a1a46e3ea1b2dc2edd9023 100644 --- a/download +++ b/download @@ -1 +1 @@ -8e66a275a25f6094c9a8d50bec1330d5 dotnet-v6.0.118.tar.gz +f356418034031aea30ff8405d8689cb2 dotnet-v6.0.120.tar.gz