Merge pull request #2 from djam/dotnet3.1:rosa2021.1

Backports and update

RuntimeIdentifierGraph-Rosa.patch

@@ -1,5 +1,7 @@
---- a/sdk/3.1.112/RuntimeIdentifierGraph.json	2021-03-21 15:37:29.355463709 +0300
-+++ b/sdk/3.1.112/RuntimeIdentifierGraph.json	2021-03-21 15:40:12.316442542 +0300
+diff --git a/sdk/3.1.118/RuntimeIdentifierGraph.json b/sdk/3.1.118/RuntimeIdentifierGraph.json-diff
+index 627a6a3..f834806 100644
+--- a/sdk/3.1.118/RuntimeIdentifierGraph.json
++++ b/sdk/3.1.118/RuntimeIdentifierGraph.json-diff
 @@ -1,5 +1,35 @@
  {
    "runtimes": {
@@ -36,3 +38,10 @@
      "alpine": {
        "#import": [
          "linux-musl"
+@@ -2368,4 +2398,4 @@
+       ]
+     }
+   }
+-}
+\ No newline at end of file
++}

dotnet3.1.spec

@@ -64,7 +64,7 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        1
+Release:        3
 Summary:        .NET Core Runtime and SDK
 Group:          Development/Other
 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
@@ -207,8 +207,11 @@ Summary:        NET Core 3.1 runtime
 
 Requires:       dotnet-hostfxr-3.1 >= %{host_rpm_version}-%{release}
 
+# remove development tools
+%if 0
 # libicu is dlopen()ed
 Requires:       %{_lib}icu-devel
+%endif
 
 %if %{use_bundled_libunwind}
 Provides: bundled(libunwind) = 1.3
@@ -407,6 +410,9 @@ cat /etc/os-release
 %if %{without bootstrap}
 # We need to create a copy because we will mutate this
 cp -a %{_libdir}/dotnet previously-built-dotnet
+pushd previously-built-dotnet
+patch -p1 < %{P:501}
+popd
 %endif
 
 %if 0%{?fedora} > 32 || 0%{?rhel} > 8