diff --git a/.gitignore b/.gitignore index 15dd745..cda0c81 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dotnet-v3.1.416-SDK-x64-bootstrap.tar.gz +/dotnet-v3.1.420-SDK.tar.gz diff --git a/core-setup-no-werror.patch b/core-setup-no-werror.patch new file mode 100644 index 0000000..47b49fc --- /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 f39aa24..a26eda3 100644 --- a/dotnet3.1.spec +++ b/dotnet3.1.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap # Avoid provides/requires from private libraries %global privlibs libhostfxr @@ -25,10 +25,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.22 -%global runtime_version 3.1.22 +%global host_version 3.1.26 +%global runtime_version 3.1.26 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.416 +%global sdk_version 3.1.420 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -67,8 +67,8 @@ License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ # ./build-dotnet-tarball dotnet-v%%{sdk_version}-SDK -#Source0: dotnet-v%%{sdk_version}-SDK.tar.gz -Source0: dotnet-v%{sdk_version}-SDK-x64-bootstrap.tar.gz +Source0: dotnet-v%{sdk_version}-SDK.tar.gz +#Source0: dotnet-v%%{sdk_version}-SDK-x64-bootstrap.tar.gz Source100: check-debug-symbols.py Source101: dotnet.sh.in @@ -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.* @@ -440,11 +444,11 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run # Provided by dotnet-host from another SRPM #install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions # dynamic completion needs the file to be named the same as the base command -#install src/cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet +#install src/dotnet-cli.*/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 +#install src/dotnet-cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet # Provided by dotnet-host from another SRPM #install -dm 0755 %%{buildroot}%%{_bindir} @@ -507,21 +511,27 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/source-built-artifacts %changelog -* Tue Dec 14 2021 Omair Majid - 3.1.416-1 +* Thu Jun 23 2022 Omair Majid - 3.1.420-1 +- Update to .NET SDK 3.1.420 and Runtime 3.1.26 +- Resolves: RHBZ#2096318 + +* Mon May 16 2022 Omair Majid - 3.1.419-1 +- Update to .NET SDK 3.1.419 and Runtime 3.1.25 +- Resolves: RHBZ#2081442 + +* Wed Apr 27 2022 Omair Majid - 3.1.418-2 +- Bump release +- Related: RHBZ#2072012 + +* Mon Apr 25 2022 Omair Majid - 3.1.418-1 +- Update to .NET SDK 3.1.418 and Runtime 3.1.24 +- Resolves: RHBZ#2072012 + +* 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/sources b/sources index 667d494..0bb7c8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v3.1.416-SDK-x64-bootstrap.tar.gz) = d9825d72a67a03eb738f3a7bf04a1d2aa335b245945e1d47874df887f1d423732b94ff7d4ddea47ea7940756a4acd04bd9999884a75063b79788f1aa800c4a58 +SHA512 (dotnet-v3.1.420-SDK.tar.gz) = d1e1fcf13f279b890a80d987b92d9851a06e2330ae092d2aa12a9764c556c23f6554bb60eddf1940b6b7454783b0efb6bff44fb867dfaaf143a1b3e148fa31a9