From 71f4cd1424562bc4e39b1721cc53161128fe7dd6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 18:41:55 -0500 Subject: [PATCH] import dotnet-2.1.509-2.el8 --- .dotnet.metadata | 2 +- .gitignore | 2 +- SPECS/dotnet.spec | 67 ++++++++++++++++++++++++++--------------------- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/.dotnet.metadata b/.dotnet.metadata index e05211e..7da8822 100644 --- a/.dotnet.metadata +++ b/.dotnet.metadata @@ -1 +1 @@ -2d247ba0f76d57d380473afeb0d7fb83c5fef1b9 SOURCES/dotnet-v2.1.11.tar.gz +5e682c8e8c5b07db830b324d4c8649e986abc9e8 SOURCES/dotnet-v2.1.13.tar.gz diff --git a/.gitignore b/.gitignore index cb502ca..ee2735f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v2.1.11.tar.gz +SOURCES/dotnet-v2.1.13.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index a276d35..6447d20 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -28,13 +28,13 @@ %global simple_name dotnet -%global host_version 2.1.11 -%global runtime_version 2.1.11 -%global sdk_version 2.1.507 +%global host_version 2.1.13 +%global runtime_version 2.1.13 +%global sdk_version 2.1.509 Name: dotnet Version: %{sdk_version} -Release: 4%{?dist} +Release: 2%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -266,23 +266,27 @@ find %{buildroot}%{_libdir}/%{simple_name}/ -type f -name '*.targets' -exec chmo find %{buildroot}%{_libdir}/%{simple_name}/ -type f -name '*.dll' -exec chmod -x {} \; find %{buildroot}%{_libdir}/%{simple_name}/ -type f -name '*.pubxml' -exec chmod -x {} \; +# Provided by dotnet-host from another SRPM # Add ~/.dotnet/tools to $PATH for all users -install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ -install %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/ +#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/ +#install %%{SOURCE2} %%{buildroot}%%{_sysconfdir}/profile.d/ -install -dm 755 %{buildroot}/%{_datadir}/bash-completion/completions +# Provided by dotnet-host from another SRPM +#install -dm 755 %%{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/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 -d -m 0755 %{buildroot}%{_bindir} -ln -s %{_libdir}/%{simple_name}/dotnet %{buildroot}%{_bindir}/ +# Provided by dotnet-host from another SRPM +#install -d -m 0755 %%{buildroot}%%{_bindir} +#ln -s %%{_libdir}/%%{simple_name}/dotnet %%{buildroot}%%{_bindir}/ -install -d -m 0755 %{buildroot}%{_mandir}/man1/ -find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \; +# Provided by dotnet-host from another SRPM +#install -d -m 0755 %%{buildroot}%%{_mandir}/man1/ +#find -iname 'dotnet*.1' -type f -exec cp {} %%{buildroot}%%{_mandir}/man1/ \; # Check debug symbols in all elf objects. This is not in %%check # because native binaries are stripped by rpm-build after %%install. @@ -290,27 +294,14 @@ find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \; echo "Testing build results for debug symbols..." %{SOURCE1} -v %{buildroot}%{_libdir}/%{simple_name}/ - -%check +# Self-check %{buildroot}%{_libdir}/%{simple_name}/dotnet --info +# Provided by dotnet-host from another SRPM +rm %{buildroot}%{_libdir}/%{simple_name}/LICENSE.txt +rm %{buildroot}%{_libdir}/%{simple_name}/ThirdPartyNotices.txt +rm %{buildroot}%{_libdir}/%{simple_name}/dotnet -%files -n %{simple_name} -# empty package useful for dependencies - -%files -n %{simple_name}-host -%dir %{_libdir}/%{simple_name} -%{_libdir}/%{simple_name}/dotnet -%dir %{_libdir}/%{simple_name}/host -%dir %{_libdir}/%{simple_name}/host/fxr -%{_bindir}/dotnet -%license %{_libdir}/%{simple_name}/LICENSE.txt -%license %{_libdir}/%{simple_name}/ThirdPartyNotices.txt -%doc %{_mandir}/man1/dotnet*.1.gz -%{_sysconfdir}/profile.d/dotnet.sh -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/dotnet %files -n %{simple_name}-host-fxr-2.1 %dir %{_libdir}/%{simple_name}/host/fxr @@ -329,6 +320,22 @@ echo "Testing build results for debug symbols..." %{_libdir}/%{simple_name}/sdk/%{sdk_version} %changelog +* Thu Aug 29 2019 Omair Majid - 2.1.509-2 +- Update to .NET Core Runtime 2.1.13 and SDK 2.1.509 +- Resolves: RHBZ#1742959 + +* Thu Aug 15 2019 Omair Majid - 2.1.508-3 +- Remove dotnet and dotnet host packages +- Resolves: RHBZ#1740879 + +* Tue Aug 13 2019 Omair Majid - 2.1.508-2 +- Bump release +- Resolves: RHBZ#1740308 + +* Thu Jul 11 2019 Omair Majid - 2.1.508-1 +- Update to .NET Core Runtime 2.1.12 and SDK 2.1.508 +- Resolves: RHBZ#1728823 + * Wed Jun 12 2019 Omair Majid - 2.1.507-4 - Bump version - Related: RHBZ#1712158