import dotnet6.0-6.0.105-1.el8_6

This commit is contained in:
CentOS Sources 2022-05-11 09:21:47 -04:00 committed by Stepan Oksanichenko
parent 67bfecb54e
commit 0fce45360a
3 changed files with 23 additions and 19 deletions

View File

@ -1 +1 @@
17be2cc793acd02bb59a6a08616045c2fd1177b8 SOURCES/dotnet-v6.0.104-SDK.tar.gz
ea3d59e0bd3c55363d7491c301efbe9b3abcfb0b SOURCES/dotnet-v6.0.105-SDK.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/dotnet-v6.0.104-SDK.tar.gz
SOURCES/dotnet-v6.0.105-SDK.tar.gz

View File

@ -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.4
%global runtime_version 6.0.4
%global host_version 6.0.5
%global runtime_version 6.0.5
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 6.0.104
%global sdk_version 6.0.105
%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: 2%{?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/
@ -232,10 +232,10 @@ Requires: dotnet-hostfxr-6.0%{?_isa} >= %{host_rpm_version}-%{release}
# libicu is dlopen()ed
Requires: libicu%{?_isa}
# See src/runtime.*/src/libraries/Native/AnyOS/brotli-version.txt
# See src/runtime/src/libraries/Native/AnyOS/brotli-version.txt
Provides: bundled(libbrotli) = 1.0.9
%if %{use_bundled_libunwind}
# See runtime.*/src/coreclr/pal/src/libunwind/libunwind-version.txt
# See runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1
%endif
@ -394,32 +394,32 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
%endif
# Fix bad hardcoded path in build
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/native/corehost/hostmisc/pal.unix.cpp
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
pushd src/runtime.*
pushd src/runtime
%patch100 -p1
%patch101 -p1
%patch102 -p1
popd
pushd src/fsharp.*
pushd src/fsharp
%patch500 -p1
popd
pushd src/arcade.*
pushd src/arcade
%patch700 -p1
popd
pushd src/roslyn.*
pushd src/roslyn
%patch800 -p3
%patch801 -p1
popd
pushd src/roslyn-analyzers.*
pushd src/roslyn-analyzers
%patch900 -p1
popd
pushd src/msbuild.*
pushd src/msbuild
# These are mono-specific fixes. Mono is only used on s390x. Restrict
# patch to s390x to avoid potential risk in other architectures.
@ -430,18 +430,18 @@ pushd src/msbuild.*
popd
pushd src/sdk.*
pushd src/sdk
%patch1500 -p1
%patch1501 -p1
popd
pushd src/installer.*
pushd src/installer
%patch1600 -p1
popd
%if ! %{use_bundled_libunwind}
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
%endif
%build
@ -539,7 +539,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
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
@ -626,6 +626,10 @@ echo "Testing build results for debug symbols..."
%changelog
* Thu May 05 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
- Update to .NET SDK 6.0.105 and Runtime 6.0.5
- Resolves: RHBZ#2082267
* Wed Apr 20 2022 Omair Majid <omajid@redhat.com> - 6.0.104-2
- Update to .NET SDK 6.0.104 and Runtime 6.0.4
- Resolves: RHBZ#2074640