diff --git a/.gitignore b/.gitignore index 5c7b22c..5921e70 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.110-SDK.tar.gz +SOURCES/dotnet-v3.1.111-SDK.tar.gz diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata index deb2a97..8964fa9 100644 --- a/.rh-dotnet31-dotnet.metadata +++ b/.rh-dotnet31-dotnet.metadata @@ -1 +1 @@ -80a400d8b755a08ffd0c303e12cd6e10f15c4ef9 SOURCES/dotnet-v3.1.110-SDK.tar.gz +e551f1b33756fa97d8357234b2cf25d094a6bf74 SOURCES/dotnet-v3.1.111-SDK.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index b25ff5a..4187592 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -26,10 +26,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.10 -%global runtime_version 3.1.10 +%global host_version 3.1.11 +%global runtime_version 3.1.11 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.110 +%global sdk_version 3.1.111 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -273,7 +273,7 @@ applications using the .NET Core SDK. %setup -q -n dotnet-v%{sdk_version}-SDK # Fix bad hardcoded path in build -sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj @@ -281,7 +281,7 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj # This patch was added when building the tarball; we use a better version rm -f patches/corefx/build-corefx-werror.patch -pushd src/corefx.* +pushd src/dotnet-corefx.* %patch100 -p1 popd @@ -289,12 +289,12 @@ pushd src/coreclr.* %patch200 -p1 popd -pushd src/core-setup.* +pushd src/dotnet-core-setup.* %patch300 -p1 %patch301 -p1 popd -pushd src/cli.* +pushd src/dotnet-cli.* %patch500 -p1 popd @@ -372,11 +372,11 @@ install %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/ install -dm 0755 %{buildroot}/%{_root_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}/%{_root_datadir}/bash-completion/completions/dotnet +install src/dotnet-cli.*/scripts/register-completions.bash %{buildroot}/%{_root_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 install -dm 0755 %{buildroot}%{_bindir} ln -s ../../../../../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/ @@ -441,6 +441,10 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog +* Wed Dec 16 2020 Omair Majid - 3.1.111-1 +- Update to .NET Core SDK 3.1.111 and Runtime 3.1.11 +- Resolves: RHBZ#1907626 + * Mon Nov 02 2020 Omair Majid - 3.1.110-1 - Update to .NET Core SDK 3.1.110 and Runtime 3.1.10 - Resolves: RHBZ#1893777