From 4a4d65cf9c8d68cf8edb4fe29bc9a09b66faa636 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 16 2020 19:04:19 +0000 Subject: import rh-dotnet31-dotnet-3.1.101-4.el7 --- diff --git a/.gitignore b/.gitignore index 1db89fc..9de317f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.100-SDK.tar.gz +SOURCES/dotnet-v3.1.101-SDK.tar.gz diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata index 7ec4ba3..0bf5a4b 100644 --- a/.rh-dotnet31-dotnet.metadata +++ b/.rh-dotnet31-dotnet.metadata @@ -1 +1 @@ -382652df0b2e7e3a30c3723a221fbcf75a97d9e2 SOURCES/dotnet-v3.1.100-SDK.tar.gz +29a8f3923c9fab2d7d73b3d151e8b8a0f1eab70b SOURCES/dotnet-v3.1.101-SDK.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index fa24e86..c63fac2 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -26,11 +26,11 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.0 -%global runtime_version 3.1.0 -%global aspnetcore_runtime_version 3.1.0 -%global sdk_version 3.1.100 -%global templates_version 3.1.0 +%global host_version 3.1.1 +%global runtime_version 3.1.1 +%global aspnetcore_runtime_version %{runtime_version} +%global sdk_version 3.1.101 +%global templates_version %{runtime_version} %global host_rpm_version %{host_version} %global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version} @@ -55,7 +55,7 @@ Name: %{?scl_prefix}dotnet Version: %{sdk_rpm_version} -Release: 1%{?dist} +Release: 4%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -273,13 +273,13 @@ 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 # This patch was added when building the tarball; we use a better version -rm patches/corefx/build-corefx-werror.patch +rm -f patches/corefx/build-corefx-werror.patch pushd src/corefx.* %patch100 -p1 @@ -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 @@ -343,15 +343,29 @@ tar xf bin/x64/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{build tar xf bin/x64/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \ -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/ -# Fix executable permissions on files +# Fix permissions on files find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.dll' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pdb' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.props' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pubxml' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} \; -chmod ugo=rx %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/apphost -chmod ugo=rx %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so -chmod ugo=rx %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost +chmod 0755 %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/apphost +chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so +chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/nethost.h +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/ref/netcoreapp3.1/*.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/obj/Microsoft.AspNetCore.App.Ref.csproj.nuget.cache +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/Microsoft.AspNetCore.App.Ref/3.1.0/Debug/netstandard2.0/Microsoft.AspNetCore.App.Ref.assets.cache +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/PackageOverrides.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/FrameworkList.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/PlatformManifest.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/data/PackageOverrides.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/data/FrameworkList.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/data/PlatformManifest.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/obj/Microsoft.AspNetCore.App.Ref.csproj.nuget.dgspec.json +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/obj/project.assets.json +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/PackageOverrides.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/FrameworkList.xml # Add ~/.dotnet/tools to $PATH for all users @@ -360,7 +374,7 @@ 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 @@ -429,6 +443,22 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog +* Tue Jan 08 2020 Omair Majid - 3.1.101-4 +- Another attempt at fixing file permissions +- Resolves: RHBZ#1787174 + +* Mon Jan 06 2020 Omair Majid - 3.1.101-3 +- Another attempt at fixing file permissions +- Resolves: RHBZ#1787174 + +* Mon Jan 06 2020 Omair Majid - 3.1.101-2 +- Fix some strange file permissions +- Resolves: RHBZ#1787174 + +* Tue Dec 31 2019 Omair Majid - 3.1.101-1 +- Update to .NET Core Runtime 3.1.1 and SDK 3.1.101 +- Resolves: RHBZ#1787174 + * Sat Nov 30 2019 Omair Majid - 3.1.100-1 - Update to .NET Core Runtime 3.1.0 and SDK 3.1.100 - Resolves: RHBZ#1767056