From 4d17ac2c409c23f9d74b8dfd2e90fdb2d657c4a6 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Apr 12 2019 14:42:06 +0000
Subject: Clean up spec file


- Make spec file consistent with other releases

- Renumber patches to make more sense: 100-series is corefx, 200-series
is coreclr, 300-series is core-setup and 400-series is cli.

---

diff --git a/dotnet2.1.spec b/dotnet2.1.spec
index a79a495..d7f3978 100644
--- a/dotnet2.1.spec
+++ b/dotnet2.1.spec
@@ -14,7 +14,7 @@
 
 # Filter flags not supported by clang/dotnet:
 #  -fcf-protection is not supported by clang
-#  -fstack-clask-protection is not supported by clang
+#  -fstack-clash-protection is not supported by clang
 #  -specs= is not supported by clang
 %global dotnet_cflags %(echo %optflags | sed -e 's/-fcf-protection//' | sed -e 's/-fstack-clash-protection//' | sed -re 's/-specs=[^ ]*//g')
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
@@ -49,15 +49,15 @@ Source0:        dotnet-v%{runtime_version}.tar.gz
 Source1:        check-debug-symbols.py
 Source2:        dotnet.sh
 
-Patch10:        corefx-optflags-support.patch
-Patch11:        corefx-32956-alpn.patch
-Patch12:        corefx-rhel-runtime-ids.patch
+Patch100:       corefx-optflags-support.patch
+Patch101:       corefx-32956-alpn.patch
+Patch102:       corefx-rhel-runtime-ids.patch
 
-Patch100:       coreclr-build-python3.patch
-Patch101:       coreclr-cmake-python3.patch
-Patch102:       coreclr-mscorlib.patch
-Patch103:       coreclr-pie.patch
-Patch104:       coreclr-assembly-hex-constants.patch
+Patch200:       coreclr-build-python3.patch
+Patch201:       coreclr-cmake-python3.patch
+Patch202:       coreclr-mscorlib.patch
+Patch203:       coreclr-pie.patch
+Patch204:       coreclr-assembly-hex-constants.patch
 
 Patch300:       core-setup-4510-commit-id.patch
 Patch301:       core-setup-pie.patch
@@ -215,24 +215,33 @@ cross platform applications that work on Linux, Mac and Windows.
 It particularly focuses on creating console applications, web
 applications and micro-services.
 
+
 %prep
 %setup -q -n %{simple_name}-v%{runtime_version}
 
 # Fix bad hardcoded path in build
 sed -i 's|/usr/share/dotnet|%{_libdir}/%{simple_name}|' src/core-setup/src/corehost/common/pal.unix.cpp
 
-pushd src/corefx
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-popd
+%if %{use_bundled_libunwind}
+# Use bundled libunwind
+sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/coreclr.proj
+%endif
 
-pushd src/coreclr
+# Disable warnings
+sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
+
+pushd src/corefx
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
-%patch103 -p1
-%patch104 -p1
+popd
+
+pushd src/coreclr
+%patch200 -p1
+%patch201 -p1
+%patch202 -p1
+%patch203 -p1
+%patch204 -p1
 popd
 
 pushd src/core-setup
@@ -244,14 +253,6 @@ pushd src/cli
 %patch400 -p1
 popd
 
-%if %{use_bundled_libunwind}
-# Use bundled libunwind
-sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/coreclr.proj
-%endif
-
-# disable -Werror
-sed -i '/add_compile_options(-Werror)/d' src/coreclr/compileoptions.cmake
-
 
 %build
 export CFLAGS="%{dotnet_cflags}"