From 1b7d3b815d2e91f365ab829dbc1608a912a7a74e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 16 2020 19:18:36 +0000 Subject: import rh-dotnet31-dotnet-3.1.102-1.el7 --- diff --git a/.gitignore b/.gitignore index 9de317f..b368d01 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.101-SDK.tar.gz +SOURCES/dotnet-v3.1.102-SDK.tar.gz diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata index 0bf5a4b..e0dafc7 100644 --- a/.rh-dotnet31-dotnet.metadata +++ b/.rh-dotnet31-dotnet.metadata @@ -1 +1 @@ -29a8f3923c9fab2d7d73b3d151e8b8a0f1eab70b SOURCES/dotnet-v3.1.101-SDK.tar.gz +6d6c2c48bef3b211909aa20b61e3031f5a6c3704 SOURCES/dotnet-v3.1.102-SDK.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index c63fac2..fd56c2b 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.1 -%global runtime_version 3.1.1 +%global host_version 3.1.2 +%global runtime_version 3.1.2 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.101 -%global templates_version %{runtime_version} +%global sdk_version 3.1.102 +%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %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: 4%{?dist} +Release: 1%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -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/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj @@ -289,12 +289,12 @@ pushd src/coreclr.* %patch200 -p1 popd -pushd src/dotnet-core-setup.* +pushd src/core-setup.* %patch300 -p1 %patch301 -p1 popd -pushd src/dotnet-cli.* +pushd src/cli.* %patch500 -p1 popd @@ -326,6 +326,7 @@ export LLVM_HOME=/opt/rh/llvm-toolset-8.0/root/usr export CMAKE_PREFIX_PATH="%{_prefix}" VERBOSE=1 ./build.sh \ + -- \ /v:n \ /p:LogVerbosity=n \ /p:MinimalConsoleLogOutput=false \ @@ -353,17 +354,13 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/app 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/Microsoft.AspNetCore.App.Ref/3.1.2/ref/netcoreapp3.1/*.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.2/data/PackageOverrides.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.2/data/FrameworkList.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.2/data/PlatformManifest.txt 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 @@ -374,7 +371,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/dotnet-cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet +install src/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 @@ -443,7 +440,11 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog -* Tue Jan 08 2020 Omair Majid - 3.1.101-4 +* Fri Mar 06 2020 Omair Majid - 3.1.102-1 +- Update to .NET Core Runtime 3.1.2 and SDK 3.1.102 +- Resolves: RHBZ#1804451 + +* Wed Jan 08 2020 Omair Majid - 3.1.101-4 - Another attempt at fixing file permissions - Resolves: RHBZ#1787174