diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index c6b8af0..e662cb4 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1,3 @@ -4521a07f53136d83916b1a044ed6cba3b8a41813 SOURCES/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz +a09c5e2ac9985b2d19f45af61f05d612f0e05bee SOURCES/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c-x64-bootstrap.tar.xz +3a2c502940a78d7378913f779b35fb536ed309c3 SOURCES/dotnet-arm64-prebuilts-2021-10-29.tar.gz +cbed859caadd340eb04a6eeec13b5fa14b733a32 SOURCES/dotnet-s390x-prebuilts-2021-10-29.tar.gz diff --git a/.gitignore b/.gitignore index faa0263..f793269 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -SOURCES/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz +SOURCES/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c-x64-bootstrap.tar.xz +SOURCES/dotnet-arm64-prebuilts-2021-10-29.tar.gz +SOURCES/dotnet-s390x-prebuilts-2021-10-29.tar.gz diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index 1aa5533..1fdc858 100644 --- a/SPECS/dotnet6.0.spec +++ b/SPECS/dotnet6.0.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap # Avoid provides/requires from private libraries %global privlibs libhostfxr @@ -60,7 +60,7 @@ Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 0.10%{?dist} +Release: 0.9%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ @@ -452,6 +452,13 @@ pushd src/sdk.* %patch1500 -p1 popd +%if %{without bootstrap} +%ifnarch x86_64 +mkdir -p artifacts/obj/%{runtime_arch}/Release +cp artifacts/obj/x64/Release/PackageVersions.props artifacts/obj/%{runtime_arch}/Release/PackageVersions.props +%endif +%endif + # Disable package validation which breaks our build, even though we # are injecting "blessed" nuget packages produced by Microsoft. # There's no need to run validation in RPM packages anyway. @@ -637,10 +644,6 @@ install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts. %changelog -* Sun Oct 31 2021 Omair Majid - 6.0.100-0.10 -- Disable bootstrap -- Related: RHBZ#2016373 - * Sat Oct 30 2021 Omair Majid - 6.0.100-0.9 - Fix msbuild to run on s390x - Related: RHBZ#2016373