From df57d4121f467e7d1cdcfd6fabd1fcb14ae566d0 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Tue, 17 Apr 2018 11:05:14 -0400
Subject: [PATCH] Modernize llvm packaging rules (but don't enable, yet)

---
 mono-core.spec | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/mono-core.spec b/mono-core.spec
index 9483c4695a..ae8f42e320 100644
--- a/mono-core.spec
+++ b/mono-core.spec
@@ -64,7 +64,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  valgrind-devel
 %endif
 %if %llvm == yes
-BuildRequires:  llvm-mono-devel
+BuildRequires:  mono-llvm-devel
 %endif
 Provides:       mono = %{version}
 Provides:       mono-cairo = %{version}
@@ -74,13 +74,6 @@ Provides:       mono-posix = %{version}
 Provides:       mono-xml-relaxng = %{version}
 Provides:       mono-ziplib = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %llvm == yes
-%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
-Requires:       libmono-llvm0 = %{version}
-%else
-Recommends:     libmono-llvm0 = %{version}
-%endif
-%endif
 %if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
 Requires:       libgdiplus0
 %else
@@ -154,14 +147,10 @@ export MONO_CPU_ARCH="armv7l-thumb"
 export MONO_CPU_ARCH="armv5el"
 %endif
 # distro specific configure options
-%if %llvm == yes
-export PATH=/opt/novell/llvm-mono/bin:$PATH
-%endif
 %configure \
   --with-sgen=%{sgen} \
 %if %llvm == yes
-  --enable-loadedllvm \
-  --disable-system-aot \
+  --with-llvm=/usr/lib/mono/llvm/ \
 %endif
 %ifarch ppc
  --with-sigaltstack=no \
@@ -570,30 +559,6 @@ Development files for libmonosgen.
 %{_libdir}/pkgconfig/monosgen-2.pc
 %endif
 
-%if %llvm == yes
-%package -n libmono-llvm0
-Summary:        Loadable LLVM libary for mono
-License:        LGPL-2.1
-Group:          Development/Libraries/C and C++
-
-%description -n libmono-llvm0
-The Mono Project is an open development initiative that is working to
-develop an open source, Unix version of the .NET development platform.
-Its objective is to enable Unix developers to build and deploy
-cross-platform .NET applications. The project will implement various
-technologies that have been submitted to the ECMA for standardization.
-
-Loadable LLVM libary for mono.
-
-%files -n libmono-llvm0
-%defattr(-, root, root)
-%{_libdir}/libmono-llvm.so*
-
-%post -n libmono-llvm0 -p /sbin/ldconfig
-
-%postun -n libmono-llvm0 -p /sbin/ldconfig
-%endif
-
 %package -n mono-locale-extras
 Summary:        Extra locale information
 License:        LGPL-2.1
@@ -1435,9 +1400,6 @@ Requires:       ibm-data-db2 = %{version}
 Requires:       libmono-2_0-1 = %{version}
 Requires:       libmono-2_0-devel = %{version}
 Requires:       mono-core = %{version}
-%if %llvm == yes
-Requires:       libmono-llvm0 = %{version}
-%endif
 %if %sgen == yes
 Requires:       libmonosgen-2_0-1 = %{version}
 Requires:       libmonosgen-2_0-devel = %{version}