diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata index 3920b02..4a151ea 100644 --- a/.dotnet3.1.metadata +++ b/.dotnet3.1.metadata @@ -1 +1 @@ -3818a42e01f00d5fe00548704a1878bc38fc74ef SOURCES/dotnet-v3.1.105-SDK.tar.gz +f8edfbafa001861019a179c45d4aa73e6873ec13 SOURCES/dotnet-v3.1.104-SDK.tar.gz diff --git a/.gitignore b/.gitignore index a2c673a..0459c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.105-SDK.tar.gz +SOURCES/dotnet-v3.1.104-SDK.tar.gz diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec index 2b96149..aa704f5 100644 --- a/SPECS/dotnet3.1.spec +++ b/SPECS/dotnet3.1.spec @@ -23,10 +23,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.5 -%global runtime_version 3.1.5 +%global host_version 3.1.4 +%global runtime_version 3.1.4 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.105 +%global sdk_version 3.1.104 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -306,7 +306,7 @@ pushd src/dotnet-corefx.* %patch103 -p1 popd -pushd src/dotnet-coreclr.* +pushd src/coreclr.* %patch200 -p1 %patch201 -p1 popd @@ -353,11 +353,11 @@ sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE101} > dotnet.sh %install install -dm 0755 %{buildroot}%{_libdir}/dotnet -ls artifacts/%{runtime_arch}/Release -tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/ +ls bin/%{runtime_arch}/Release +tar xf bin/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/ # Install managed symbols -tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \ +tar xf bin/%{runtime_arch}/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 @@ -380,12 +380,6 @@ chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/ 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 -# See https://github.com/dotnet/source-build-reference-packages/pull/121 -rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/obj -rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/microsoft.netcore.app.ref -rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/netstandard.library.ref -rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/obj - install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ @@ -460,14 +454,6 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog -* Mon Jun 08 2020 Omair Majid - 3.1.105-2 -- Remove incorrectly installed files -- Resolves: RHBZ#1844515 - -* Fri Jun 05 2020 Omair Majid - 3.1.105-1 -- Update to .NET Core Runtime 3.1.5 and SDK 3.1.105 -- Resolves: RHBZ#1844515 - * Thu May 07 2020 Omair Majid - 3.1.104-2 - Update to new release - Resolves: RHBZ#1833091