From aeda09cda9096a2fca9753d5c71ca0229e8d7294 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 15 2019 21:48:51 +0000 Subject: import rh-dotnet21-dotnet-2.1.507-2.el7 --- diff --git a/.gitignore b/.gitignore index a3eed05..cb502ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v2.1.10.tar.gz +SOURCES/dotnet-v2.1.11.tar.gz diff --git a/.rh-dotnet21-dotnet.metadata b/.rh-dotnet21-dotnet.metadata index e43b410..e05211e 100644 --- a/.rh-dotnet21-dotnet.metadata +++ b/.rh-dotnet21-dotnet.metadata @@ -1 +1 @@ -664232bc73c26125e781ca4bea68ff575cdba9e5 SOURCES/dotnet-v2.1.10.tar.gz +2d247ba0f76d57d380473afeb0d7fb83c5fef1b9 SOURCES/dotnet-v2.1.11.tar.gz diff --git a/SOURCES/register-completions.bash b/SOURCES/register-completions.bash new file mode 100644 index 0000000..1dd6509 --- /dev/null +++ b/SOURCES/register-completions.bash @@ -0,0 +1,16 @@ +# bash parameter completion for the dotnet CLI + +_dotnet_bash_complete() +{ + local word=${COMP_WORDS[COMP_CWORD]} + + local completions + completions="$(dotnet complete --position "${COMP_POINT}" "${COMP_LINE}" 2>/dev/null)" + if [ $? -ne 0 ]; then + completions="" + fi + + COMPREPLY=( $(compgen -W "$completions" -- "$word") ) +} + +complete -f -F _dotnet_bash_complete dotnet diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 2d0842e..433a707 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -30,12 +30,12 @@ # on system libcurl package. We require the %%{?scl_prefix}libcurl package %global __requires_exclude ^(%{privlibs}|libcurl)\\.so -%global runtime_version 2.1.10 -%global sdk_version 2.1.506 +%global runtime_version 2.1.11 +%global sdk_version 2.1.507 Name: %{?scl_prefix}dotnet Version: %{sdk_version} -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD @@ -50,6 +50,7 @@ URL: https://github.com/dotnet/ Source0: dotnet-v%{runtime_version}.tar.gz Source1: check-debug-symbols.py +Source2: https://raw.githubusercontent.com/dotnet/cli/53f485c23cc467c62f80252696b8ec51ce8b4564/scripts/register-completions.bash Patch100: corefx-32956-alpn.patch @@ -206,7 +207,7 @@ find %{buildroot}%{_libdir}/%{pkg_name}/ -type f -name '*.pubxml' -exec chmod -x install -dm 755 %{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 %{SOURCE2} %{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 @@ -256,6 +257,14 @@ echo "Testing build results for debug symbols..." %{_libdir}/%{pkg_name}/sdk/%{sdk_version} %changelog +* Wed May 01 2019 Omair Majid - 2.1.507-2 +- Use the latest upstream completion file for bash completion +- Resolves: RHBZ#1705259 + +* Wed May 01 2019 Omair Majid - 2.1.507-1 +- Update to .NET Core Runtime 2.1.11 and SDK 2.1.507 +- Resolves: RHBZ#1705147 + * Tue Apr 02 2019 Omair Majid - 2.1.506-1 - Update to .NET Core Runtime 2.1.10 and SDK 2.1.506