diff --git a/.gitignore b/.gitignore index 554ef7a..6fe2ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v2.2.4.tar.gz +SOURCES/dotnet-v2.2.5.tar.gz diff --git a/.rh-dotnet22-dotnet.metadata b/.rh-dotnet22-dotnet.metadata index cac6043..27a8874 100644 --- a/.rh-dotnet22-dotnet.metadata +++ b/.rh-dotnet22-dotnet.metadata @@ -1 +1 @@ -1dfd4445cf932d601f351cbc270522183bd3494f SOURCES/dotnet-v2.2.4.tar.gz +a8e58a2c6305622ff8a7e7b38d68a3aa948b81a6 SOURCES/dotnet-v2.2.5.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 8deda10..ceffadb 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -28,9 +28,9 @@ %global dotnet_cflags %(echo %optflags | sed -e 's/-fcf-protection//' | sed -re 's/-specs=[^ ]*//g') %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 2.2.4 -%global runtime_version 2.2.4 -%global sdk_version 2.2.106 +%global host_version 2.2.5 +%global runtime_version 2.2.5 +%global sdk_version 2.2.107 Name: %{?scl_prefix}dotnet Version: %{sdk_version} @@ -49,6 +49,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 Patch101: corefx-optflags-support.patch @@ -229,10 +230,9 @@ find %{buildroot}%{_libdir}/%{pkg_name}/ -type f -name '*.targets' -exec chmod - find %{buildroot}%{_libdir}/%{pkg_name}/ -type f -name '*.dll' -exec chmod -x {} \; find %{buildroot}%{_libdir}/%{pkg_name}/ -type f -name '*.pubxml' -exec chmod -x {} \; -#TODO: find a way to make completion parallel-installable -#install -dm 755 %%{buildroot}/%%{_root_datadir}/bash-completion/completions +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 @@ -265,9 +265,9 @@ echo "Testing build results for debug symbols..." %doc %{_libdir}/%{pkg_name}/ThirdPartyNotices.txt %doc %{_mandir}/man1/dotnet*.1.gz # shell completions are currently only picked up from %%{_root_datadir} -#%%dir %%{_root_datadir}/bash-completion -#%%dir %%{_root_datadir}/bash-completion/completions -#%%{_root_datadir}/bash-completion/completions/dotnet +%dir %{_root_datadir}/bash-completion +%dir %{_root_datadir}/bash-completion/completions +%{_root_datadir}/bash-completion/completions/dotnet %files host-fxr-2.2 %dir %{_libdir}/%{pkg_name}/host/fxr @@ -286,6 +286,14 @@ echo "Testing build results for debug symbols..." %{_libdir}/%{pkg_name}/sdk/%{sdk_version} %changelog +* Wed May 01 2019 Omair Majid - 2.2.107-2 +- Enable bash completion using the latest upstream completion file +- Resolves: RHBZ#1654863 + +* Tue Apr 30 2019 Omair Majid - 2.2.107-1 +- Update to .NET Core Runtime 2.2.5 and SDK 2.2.107 +- Resolves: RHBZ#1704934 + * Mon Apr 08 2019 Omair Majid - 2.2.106-2 - Update to .NET Core Runtime 2.2.4 and SDK 2.2.106 - Resolves: RHBZ#1696779