From 40d6b775c712e71b1fc7a7bc4726d8c80dcbd386 Mon Sep 17 00:00:00 2001
From: Timotheus Pokorra <timotheus.pokorra@solidcharity.com>
Date: Jun 19 2020 18:45:11 +0000
Subject: upgrade to Mono 6.8.0.123, with a bootstrap build


---

diff --git a/mono-6.6.0-python3.patch b/mono-6.6.0-python3.patch
index d59f785..2f67982 100644
--- a/mono-6.6.0-python3.patch
+++ b/mono-6.6.0-python3.patch
@@ -50,4 +50,4 @@ diff -up mono-5.18.1.0/mono/mini/Makefile.in.py3 mono-5.18.1.0/mono/mini/Makefil
 +GENMDESC_PRG = python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir)
  LLVM_AOT_RUNTIME_OPTS = $(if $(LLVM),--llvm,)
  @AMD64_FALSE@LLVM_AOT_COMPILER_OPTS = 
- @AMD64_TRUE@LLVM_AOT_COMPILER_OPTS = $(if $(LLVM),"=llvmllc=-mcpu=generic -mattr=+sse3",)
+ @AMD64_TRUE@LLVM_AOT_COMPILER_OPTS = $(if $(LLVM),llvmllc=-mattr=+sse3,)
diff --git a/mono.spec b/mono.spec
index a67af7a..3bbd9ce 100644
--- a/mono.spec
+++ b/mono.spec
@@ -1,8 +1,10 @@
+%global _with_bootstrap 1
+%bcond_with bootstrap
+
 %ifarch s390x
 # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609
 %undefine _hardened_build
 %endif
-%global bootstrap 0
 %if 0%{?el6}
 # see https://fedorahosted.org/fpc/ticket/395, it was added to el7
 %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64 ppc64le
@@ -15,15 +17,15 @@
 %global _monogacdir %{_monodir}/gac
 %endif
 
-%if 0%{?rhel}%{?el6}%{?el7} || 0%{?bootstrap}
+%if 0%{?rhel}%{?el6}%{?el7} || %{with bootstrap}
 # to resolve: "ERROR: No build ID note found"
 %undefine _missing_build_ids_terminate_build
 %endif
 
-%global xamarinrelease 161
+%global xamarinrelease 123
 Name:           mono
-Version:        6.6.0
-Release:        5%{?dist}
+Version:        6.8.0
+Release:        0%{?dist}
 Summary:        Cross-platform, Open Source, .NET development framework
 
 License:        MIT
@@ -71,14 +73,12 @@ BuildRequires:  perl-Getopt-Long
 
 # Yes, mono actually depends on itself, because
 # we deleted the bootstrapping binaries. If you
-# need to bootstrap mono, comment out this BuildRequires
-# and don't delete the binaries in %%prep.
+# need to bootstrap mono, set _with_bootstrap at the top
+# which results in not deleting the binaries in %%prep.
 
-%if 0%{bootstrap}
-# for bootstrap, use bundled monolite and reference assemblies instead of local mono
-%else
-BuildRequires:  mono-core >= 6.6
-BuildRequires:  mono-devel >= 6.6
+%if %{without bootstrap}
+BuildRequires:  mono-core >= 6.8
+BuildRequires:  mono-devel >= 6.8
 %endif
 
 # JIT only available on these:
@@ -361,7 +361,7 @@ sed -i 's|BOOTSTRAP_BIN_PROFILE = v4.7|BOOTSTRAP_BIN_PROFILE = v4.7.1|g' mcs/bui
 # Remove hardcoded lib directory for libMonoPosixHelper.so from the config
 sed -i 's|$mono_libdir/||g' data/config.in
 
-%if 0%{bootstrap}
+%if %{with bootstrap}
 # for bootstrap, keep some binaries
 find . -name "*.dll" -not -path "./mcs/class/lib/monolite-linux/*" -not -path "./external/binary-reference-assemblies/v4.7.1/*" -print -delete
 find . -name "*.exe" -not -path "./mcs/class/lib/monolite-linux/*" -print -delete
@@ -477,10 +477,13 @@ cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.5-api && cd -
 # as requested in bug 1704861; we have had that link in F29 with Mono 4.8 as well.
 cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.0-api && cd -
 
+# for Epel7, we don't deliver these files, they are still provided by rpm-build-4.11.3-43.el7.x86_64
+%if 0%{?el7}%{?el8} == 0
 # rpm helper scripts
 mkdir -p %{buildroot}%{_prefix}/lib/rpm/fileattrs/
 install -p -m755 %{SOURCE2} %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm/
 install -p -m644 %{SOURCE4} %{buildroot}%{_prefix}/lib/rpm/fileattrs/
+%endif
 
 %find_lang mcs
 
@@ -659,7 +662,7 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt
 %{_bindir}/mono-find-provides
 %{_bindir}/mono-find-requires
 %{_bindir}/monodis
-%mono_bin monolinker
+%{_bindir}/monolinker
 %mono_bin mono-shlib-cop
 %mono_bin mono-xmltool
 %mono_bin monop
@@ -746,8 +749,13 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt
 %{_includedir}/mono-2.0/mono/metadata/*.h
 %{_includedir}/mono-2.0/mono/utils/*.h
 %{_includedir}/mono-2.0/mono/cil/opcode.def
+
+# for Epel7, we don't deliver these files, they are still provided by rpm-build-4.11.3-43.el7.x86_64
+%if 0%{?el7}%{?el8} == 0
 %{_prefix}/lib/rpm/mono-find-*
 %{_prefix}/lib/rpm/fileattrs/mono.attr
+%endif
+
 %{_bindir}/aprofutil
 %mono_bin aprofutil
 %{_mandir}/man1/aprofutil.1.gz
@@ -924,6 +932,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt
 %files complete
 
 %changelog
+* Wed Jun 17 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.8.0-0
+- upgrade to Mono 6.8.0.123, with a bootstrap build
+
 * Mon Feb 03 2020 Robert-André Mauchin <zebob.m@gmail.com> - 6.6.0-5
 - Reenable mdoc build (#1797360)
 
diff --git a/sources b/sources
index d8bf139..64edd14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mono-6.6.0.161.tar.xz) = 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186
+SHA512 (mono-6.8.0.123.tar.xz) = f702d1ee3a7e8b1a028de02fe6f3ab78e1c5171a547c37db7e934c33533984f2847636476407ad46daeb150640136d6bb28c12c9482c1806997df2dfd7a839f1