import dotnet3.1-3.1.416-3.el8_5

This commit is contained in:
CentOS Sources 2022-01-31 04:52:23 -05:00 committed by Stepan Oksanichenko
parent 10a5cb1114
commit f37f90d79a
3 changed files with 33 additions and 15 deletions

View File

@ -1 +1 @@
c0f6d5f50eb52c337450d0d71f7d50c7521a844c SOURCES/dotnet-v3.1.120-SDK.tar.gz
6d8a2bb600af2f73f425857174dbca974fc9c48f SOURCES/dotnet-v3.1.416-SDK.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/dotnet-v3.1.120-SDK.tar.gz
SOURCES/dotnet-v3.1.416-SDK.tar.gz

View File

@ -25,10 +25,10 @@
%endif
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
%global host_version 3.1.20
%global runtime_version 3.1.20
%global host_version 3.1.22
%global runtime_version 3.1.22
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 3.1.120
%global sdk_version 3.1.416
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
%global host_rpm_version %{host_version}
@ -61,14 +61,14 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
Release: 2%{?dist}
Release: 3%{?dist}
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
# ./build-dotnet-tarball dotnet-v%%{sdk_version}-SDK
Source0: dotnet-v%{sdk_version}-SDK.tar.gz
#Source1: dotnet-v%%{sdk_version}-SDK-rhel.8-arm64.tar.gz
#Source0: dotnet-v%%{sdk_version}-SDK-x64-bootstrap.tar.gz
Source100: check-debug-symbols.py
Source101: dotnet.sh.in
@ -308,11 +308,17 @@ These are not meant for general use.
%prep
%if %{with bootstrap}
%ifarch x86_64
%setup T -b0 -q -n dotnet-v%{sdk_version}-SDK
%setup T -b0 -q -n dotnet-v%{sdk_version}-SDK-%{runtime_arch}-bootstrap
%endif
%ifarch aarch64
%setup T -b1 -q -n dotnet-v%{sdk_version}-SDK-rhel.8-arm64
%setup T -b1 -q -n dotnet-v%{sdk_version}-SDK-%{runtime_arch}-bootstrap
%endif
%else
%setup -q -n dotnet-v%{sdk_version}-SDK
%endif
%if %{without bootstrap}
@ -333,28 +339,28 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
%endif
# 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.common.props
%patch1 -p1
pushd src/dotnet-corefx.*
pushd src/corefx.*
%patch100 -p1
%patch103 -p1
popd
pushd src/dotnet-coreclr.*
pushd src/coreclr.*
%patch200 -p1
#%%patch201 -p1
popd
pushd src/dotnet-core-setup.*
pushd src/core-setup.*
%patch300 -p1
popd
pushd src/dotnet-cli.*
pushd src/cli.*
%patch500 -p1
popd
@ -501,7 +507,19 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%{_libdir}/dotnet/source-built-artifacts
%changelog
* Wed Oct 15 2021 Omair Majid <omajid@redhat.com> - 3.1.120-2
* Tue Jan 25 2022 Omair Majid <omajid@redhat.com> - 3.1.416-3
- Disable bootstrap
- Resolves: RHBZ#2031429
* Fri Jan 21 2022 Omair Majid <omajid@redhat.com> - 3.1.416-2
- Update to new release of .NET SDK 3.1.416 and Runtime 3.1.22
- Resolves: RHBZ#2031429
* Tue Dec 14 2021 Omair Majid <omajid@redhat.com> - 3.1.416-1
- Update to .NET SDK 3.1.416 and Runtime 3.1.22
- Resolves: RHBZ#2031429
* Fri Oct 15 2021 Omair Majid <omajid@redhat.com> - 3.1.120-2
- Rebuild to fix version
- Resolves: RHBZ#2011820