From 3bdaa65379e9f7a5cc3b01874c6855b0568da4e4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 22 2022 16:09:06 +0000 Subject: import dotnet6.0-6.0.105-1.el8 --- diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index 21b2f55..b22fc74 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -17be2cc793acd02bb59a6a08616045c2fd1177b8 SOURCES/dotnet-v6.0.104-SDK.tar.gz +ea3d59e0bd3c55363d7491c301efbe9b3abcfb0b SOURCES/dotnet-v6.0.105-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 1f6646c..d1f5881 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.104-SDK.tar.gz +SOURCES/dotnet-v6.0.105-SDK.tar.gz diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index 124c282..fb952f6 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.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: 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/ @@ -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 @@ -627,6 +627,10 @@ echo "Testing build results for debug symbols..." %changelog +* Mon May 16 2022 Omair Majid - 6.0.105-1 +- Update to .NET SDK 6.0.105 and Runtime 6.0.5 +- Resolves: RHBZ#2082265 + * Mon Apr 25 2022 Omair Majid - 6.0.104-3 - Update to .NET SDK 6.0.104 and Runtime 6.0.4 - Resolves: RHBZ#2072006