diff --git a/.gitignore b/.gitignore index 569a366..2705591 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v5.0.207-SDK.tar.gz +SOURCES/dotnet-v5.0.208-SDK.tar.gz diff --git a/.rh-dotnet50-dotnet.metadata b/.rh-dotnet50-dotnet.metadata index aa26bd8..3525e46 100644 --- a/.rh-dotnet50-dotnet.metadata +++ b/.rh-dotnet50-dotnet.metadata @@ -1 +1 @@ -7ef9353663932cefd559f6d3099f846e48b10ec7 SOURCES/dotnet-v5.0.207-SDK.tar.gz +b54b7a8c63e944d40327ec62376dc556b3da8b79 SOURCES/dotnet-v5.0.208-SDK.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 44c014b..3989d4b 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -1,7 +1,7 @@ %{?scl:%scl_package dotnet} %{!?scl:%global pkg_name %{name}} -%bcond_without bootstrap +%bcond_with bootstrap # Avoid provides/requires from private libraries %global privlibs libhostfxr @@ -23,10 +23,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 5.0.10 -%global runtime_version 5.0.10 +%global host_version 5.0.11 +%global runtime_version 5.0.11 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 5.0.207 +%global sdk_version 5.0.208 %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -94,9 +94,9 @@ BuildRequires: llvm-toolset-10.0-clang BuildRequires: llvm-toolset-10.0-cmake BuildRequires: coreutils %if %{without bootstrap} -BuildRequires: dotnet-build-reference-packages -BuildRequires: dotnet-sdk-5.0 -BuildRequires: dotnet-sdk-5.0-source-built-artifacts +BuildRequires: %{?scl_prefix}dotnet5.0-build-reference-packages +BuildRequires: %{?scl_prefix}dotnet-sdk-5.0 +BuildRequires: %{?scl_prefix}dotnet-sdk-5.0-source-built-artifacts %endif BuildRequires: findutils BuildRequires: git @@ -393,13 +393,6 @@ export LIBRARY_PATH="%{_libdir}" export LLVM_HOME=/opt/rh/llvm-toolset-10.0/root/usr export CMAKE_PREFIX_PATH="%{_prefix}" - -#%%if %%{without bootstrap} -# --with-ref-packages %%{_libdir}/dotnet/reference-packages/ \ -# --with-packages %%{_libdir}/dotnet/source-built-artifacts/*.tar.gz \ -# --with-sdk %%{_libdir}/dotnet \ -#%%endif - VERBOSE=1 ./build.sh \ %if %{without bootstrap} --with-sdk previously-built-dotnet \ @@ -468,8 +461,8 @@ echo "%{_libdir}/dotnet" >> install_location install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet install install_location %{buildroot}%{_sysconfdir}/dotnet/ -#install -dm 0755 %%{buildroot}%%{_libdir}/dotnet/source-built-artifacts -#install artifacts/%%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %%{buildroot}/%%{_libdir}/dotnet/source-built-artifacts/ +install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts +install artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ # Check debug symbols in all elf objects. This is not in %%check # because native binaries are stripped by rpm-build after %%install. @@ -523,12 +516,24 @@ echo "Testing build results for debug symbols..." %{_libdir}/dotnet/sdk/%{sdk_version} %dir %{_libdir}/dotnet/packs -#%%files -n dotnet-sdk-5.0-source-built-artifacts -#%%dir %%{_libdir}/dotnet -#%%{_libdir}/dotnet/source-built-artifacts +%files -n %{?scl_prefix}dotnet-sdk-5.0-source-built-artifacts +%dir %{_libdir}/dotnet +%{_libdir}/dotnet/source-built-artifacts %changelog +* Wed Oct 06 2021 Omair Majid - 5.0.208-1 +- Update to .NET SDK 5.0.208 and Runtime 5.0.11 +- Resolves: RHBZ#2011057 + +* Sun Oct 03 2021 Omair Majid - 5.0.207-3 +- Build using the previously built .NET SDK +- Resolves: RHBZ#2006504 + +* Tue Sep 21 2021 Omair Majid - 5.0.207-2 +- Enable dotnet-sdk-5.0-source-built-artifacts subpackage +- Related: RHBZ#2006504 + * Tue Sep 07 2021 Omair Majid - 5.0.207-1 - Update to .NET SDK 5.0.207 and Runtime 5.0.10 - Resolves: RHBZ#2000318