From fd9907138998421cbd71c8cb8dc367cfff67fd48 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 10 May 2022 11:01:09 -0400 Subject: [PATCH] import dotnet3.1-3.1.418-1.el8_6 --- SOURCES/core-setup-no-werror.patch | 27 ++++++++++++++++++++++ SPECS/dotnet3.1.spec | 36 +++++++++--------------------- 2 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 SOURCES/core-setup-no-werror.patch diff --git a/SOURCES/core-setup-no-werror.patch b/SOURCES/core-setup-no-werror.patch new file mode 100644 index 0000000..47b49fc --- /dev/null +++ b/SOURCES/core-setup-no-werror.patch @@ -0,0 +1,27 @@ +From e900fff68af76d51a59ac085b35ace76939bc007 Mon Sep 17 00:00:00 2001 +From: Omair Majid +Date: Tue, 18 Jan 2022 21:45:52 -0500 +Subject: [PATCH] Disable Werror + +This is so late in the release cycle that fixing warnings is just not +really worth it. The general approach is to fix the issues in the +development branches and disable warnings in the older release branches. +--- + src/settings.cmake | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/settings.cmake b/src/settings.cmake +index ff1e04f9..5cc9b3ef 100644 +--- a/src/settings.cmake ++++ b/src/settings.cmake +@@ -201,7 +201,6 @@ else() + # compiling with -std=c++11. + # add_compile_options(-Weverything) + endif() +- add_compile_options(-Werror) + add_compile_options(-Wno-missing-field-initializers) + add_compile_options(-Wno-unused-function) + add_compile_options(-Wno-unused-local-typedef) +-- +2.34.1 + diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec index ef79d23..5cb59cc 100644 --- a/SPECS/dotnet3.1.spec +++ b/SPECS/dotnet3.1.spec @@ -83,6 +83,7 @@ Patch200: coreclr-27048-sysctl-deprecation.patch #Patch201: coreclr-libunwind-fno-common.patch Patch300: core-setup-do-not-strip.patch +Patch301: core-setup-no-werror.patch Patch500: cli-telemetry-optout.patch @@ -192,6 +193,8 @@ Requires: dotnet-hostfxr-3.1%{?_isa} >= %{host_rpm_version}-%{release} # libicu is dlopen()ed Requires: libicu +# See src/corefx.*/src/Native/AnyOS/brotli-version.txt +Provides: bundled(libbrotli) = 1.0.9 %if %{use_bundled_libunwind} Provides: bundled(libunwind) = 1.3 %endif @@ -358,6 +361,7 @@ popd pushd src/dotnet-core-setup.* %patch300 -p1 +%patch301 -p1 popd pushd src/dotnet-cli.* @@ -507,37 +511,19 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/source-built-artifacts %changelog -* Mon Apr 04 2022 Omair Majid - 3.1.418-1 +* Fri Apr 22 2022 Omair Majid - 3.1.418-1 - Update to .NET SDK 3.1.418 and Runtime 3.1.24 -- Resolves: RHBZ#2073450 +- Resolves: RHBZ#2074654 -* Fri Mar 04 2022 Omair Majid - 3.1.417-1 +* Mon Mar 28 2022 Omair Majid - 3.1.417-1 - Update to .NET SDK 3.1.417 and Runtime 3.1.23 -- Resolves: RHBZ#2060567 +- Resolves: RHBZ#2060566 -* Tue Jan 25 2022 Omair Majid - 3.1.416-3 -- Disable bootstrap -- Resolves: RHBZ#2031429 - -* Fri Jan 21 2022 Omair Majid - 3.1.416-2 -- Update to new release of .NET SDK 3.1.416 and Runtime 3.1.22 -- Resolves: RHBZ#2031429 - -* Tue Dec 14 2021 Omair Majid - 3.1.416-1 +* Tue Jan 25 2022 Omair Majid - 3.1.416-4 - Update to .NET SDK 3.1.416 and Runtime 3.1.22 -- Resolves: RHBZ#2031429 - -* Fri Oct 15 2021 Omair Majid - 3.1.120-2 -- Rebuild to fix version - Resolves: RHBZ#2011820 - -* Wed Oct 13 2021 Omair Majid - 3.1.120-1 -- Update to .NET SDK 3.1.120 and Runtime 3.1.20 -- Resolves: RHBZ#2011820 - -* Thu Sep 23 2021 Omair Majid - 3.1.119-2 -- Update to .NET SDK 3.1.119 and Runtime 3.1.19 -- Resolves: RHBZ#2000313 +- Resolves: RHBZ#2003077 +- Resolves: RHBZ#2031428 * Sat Aug 14 2021 Omair Majid - 3.1.118-1 - Update to .NET SDK 3.1.118 and Runtime 3.1.18