diff --git a/core-setup-no-werror.patch b/core-setup-no-werror.patch new file mode 100644 index 0000000000000000000000000000000000000000..47b49fcdd75cd6a86d772eda37b516c44a66838d --- /dev/null +++ b/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/dotnet3.1.spec b/dotnet3.1.spec index d0251e7ebc3532109e0e371713b362b73a8000c8..688a1a2b24bb57f38ae195e0eed1efabc3229988 100644 --- a/dotnet3.1.spec +++ b/dotnet3.1.spec @@ -1,5 +1,3 @@ -%define anolis_os_version %(source /etc/os-release; echo ${VERSION}) -%define anolis_release .0.1 %bcond_with bootstrap # Avoid provides/requires from private libraries @@ -27,10 +25,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.23 -%global runtime_version 3.1.23 +%global host_version 3.1.25 +%global runtime_version 3.1.25 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.417 +%global sdk_version 3.1.419 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -57,13 +55,13 @@ %if 0%{?centos} %global runtime_id centos.%{centos}-%{runtime_arch} %else -%global runtime_id anolis.%{anolis_os_version}-%{runtime_arch} +%global runtime_id rhel.%{rhel}-%{runtime_arch} %endif %endif Name: dotnet3.1 Version: %{sdk_rpm_version} -Release: 1%{anolis_release}%{?dist} +Release: 1%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -85,11 +83,10 @@ 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 -Patch1000: 0001-dotnet-anolis-add-distro.patch - ExclusiveArch: x86_64 BuildRequires: clang @@ -196,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 @@ -362,14 +361,13 @@ popd pushd src/dotnet-core-setup.* %patch300 -p1 +%patch301 -p1 popd pushd src/dotnet-cli.* %patch500 -p1 popd -%patch1000 -p1 - # If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.common.props || \ sed -i 's|\$(BuildArguments) |$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' repos/coreclr.common.props @@ -513,36 +511,23 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/source-built-artifacts %changelog -* Sat Mar 12 2022 Liwei Ge - 3.1.417-1.0.1 -- Add anolis distro info(Liwei Ge) +* Thu May 05 2022 Omair Majid - 3.1.419-1 +- Update to .NET SDK 3.1.419 and Runtime 3.1.25 +- Resolves: RHBZ#2081443 -* Fri Mar 04 2022 Omair Majid - 3.1.417-1 -- Update to .NET SDK 3.1.417 and Runtime 3.1.23 -- Resolves: RHBZ#2060567 +* Fri Apr 22 2022 Omair Majid - 3.1.418-1 +- Update to .NET SDK 3.1.418 and Runtime 3.1.24 +- Resolves: RHBZ#2074654 -* 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 +* Mon Mar 28 2022 Omair Majid - 3.1.417-1 +- Update to .NET SDK 3.1.417 and Runtime 3.1.23 +- Resolves: RHBZ#2060566 -* 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 diff --git a/download b/download index 907b91808a5f6998186b4ba1c55782b33dff631e..2d324f0fabf955e182c0f4a60ced6e82e694b84f 100644 --- a/download +++ b/download @@ -1 +1 @@ -90a62ba0fbd083bd2f912f54ae361285 dotnet-v3.1.417-SDK.tar.gz +d6e4655f5971de8d38487761b701f878 dotnet-v3.1.419-SDK.tar.gz