Commit 36003ca4 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet3.1-3.1.120-2.el8_5

parent b1dcc274
f32e4c0d50bd5566b4f85a5bfa953158d7c636f3 SOURCES/dotnet-v3.1.119-SDK.tar.gz
c0f6d5f50eb52c337450d0d71f7d50c7521a844c SOURCES/dotnet-v3.1.120-SDK.tar.gz
SOURCES/dotnet-v3.1.119-SDK.tar.gz
SOURCES/dotnet-v3.1.120-SDK.tar.gz
......@@ -56,8 +56,8 @@ diff -Naurp dotnet-v3.1.120-SDK-orig/src/dotnet-corefx.c2011c5350eba4c83554205d0
+ "any",
+ "base"
+ ],
+ "rocky.8.4": [
+ "rocky.8.4",
+ "rocky.8.5": [
+ "rocky.8.5",
+ "rocky",
+ "rhel",
+ "linux",
......@@ -65,9 +65,9 @@ diff -Naurp dotnet-v3.1.120-SDK-orig/src/dotnet-corefx.c2011c5350eba4c83554205d0
+ "any",
+ "base"
+ ],
+ "rocky.8.4-arm64": [
+ "rocky.8.4-arm64",
+ "rocky.8.4",
+ "rocky.8.5-arm64": [
+ "rocky.8.5-arm64",
+ "rocky.8.5",
+ "rocky-arm64",
+ "rocky",
+ "rhel-arm64",
......@@ -79,9 +79,9 @@ diff -Naurp dotnet-v3.1.120-SDK-orig/src/dotnet-corefx.c2011c5350eba4c83554205d0
+ "any",
+ "base"
+ ],
+ "rocky.8.4-x64": [
+ "rocky.8.4-x64",
+ "rocky.8.4",
+ "rocky.8.5-x64": [
+ "rocky.8.5-x64",
+ "rocky.8.5",
+ "rocky-x64",
+ "rocky",
+ "rhel-x64",
......@@ -143,20 +143,20 @@ diff -Naurp dotnet-v3.1.120-SDK-orig/src/dotnet-corefx.c2011c5350eba4c83554205d0
+ "rhel-x64"
+ ]
+ },
+ "rocky.8.4": {
+ "rocky.8.5": {
+ "#import": [
+ "rocky"
+ ]
+ },
+ "rocky.8.4-arm64": {
+ "rocky.8.5-arm64": {
+ "#import": [
+ "rocky.8.4",
+ "rocky.8.5",
+ "rocky-arm64"
+ ]
+ },
+ "rocky.8.4-x64": {
+ "rocky.8.5-x64": {
+ "#import": [
+ "rocky.8.4",
+ "rocky.8.5",
+ "rocky-x64"
+ ]
+ },
......
......@@ -25,10 +25,10 @@
%endif
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
%global host_version 3.1.19
%global runtime_version 3.1.19
%global host_version 3.1.20
%global runtime_version 3.1.20
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 3.1.119
%global sdk_version 3.1.120
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
%global host_rpm_version %{host_version}
......@@ -61,7 +61,7 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
Release: 2%{?dist}.rocky.0
Release: 2%{?dist}.rocky.0.1
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
......@@ -334,28 +334,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/core-setup.*/src/corehost/common/pal.unix.cpp
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
# Disable warnings
sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props
%patch1 -p1
pushd src/corefx.*
pushd src/dotnet-corefx.*
%patch100 -p1
%patch103 -p1
popd
pushd src/coreclr.*
pushd src/dotnet-coreclr.*
%patch200 -p1
#%%patch201 -p1
popd
pushd src/core-setup.*
pushd src/dotnet-core-setup.*
%patch300 -p1
popd
pushd src/cli.*
pushd src/dotnet-cli.*
%patch500 -p1
popd
......@@ -503,9 +503,17 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%{_libdir}/dotnet/source-built-artifacts
%changelog
* Tue Nov 09 2021 Release Engineering <releng@rockylinux.org> - 3.1.119-2.rocky.0
* Wed Nov 10 2021 Release Engineering <releng@rockylinux.org> - 3.1.120-2.rocky.0.1
- Add Rocky Runtime ID with minor versions
* Wed Oct 15 2021 Omair Majid <omajid@redhat.com> - 3.1.120-2
- Rebuild to fix version
- Resolves: RHBZ#2011820
* Wed Oct 13 2021 Omair Majid <omajid@redhat.com> - 3.1.120-1
- Update to .NET SDK 3.1.120 and Runtime 3.1.20
- Resolves: RHBZ#2011820
* Thu Sep 23 2021 Omair Majid <omajid@redhat.com> - 3.1.119-2
- Update to .NET SDK 3.1.119 and Runtime 3.1.19
- Resolves: RHBZ#2000313
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment