[mono/f17] Add build work around for building on ARM hardfp, spec cleanups

[Peter Robinson]

commit 4f67fac28d9073548c1a1a09d0d8de6b3744e5d1
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Apr 16 22:36:48 2012 +0100

    Add build work around for building on ARM hardfp, spec cleanups

 mono-2.10-armhfp.patch |   22 ++++++++++++++++
 mono.spec              |   63 ++++++++++++++++++++++++++---------------------
 2 files changed, 57 insertions(+), 28 deletions(-)
---
diff --git a/mono-2.10-armhfp.patch b/mono-2.10-armhfp.patch
new file mode 100644
index 0000000..00e77d7
--- /dev/null
+++ b/mono-2.10-armhfp.patch
@@ -0,0 +1,22 @@
+Index: mono-2.10.6/configure
+===================================================================
+--- mono-2.10.6.orig/configure
++++ mono-2.10.6/configure
+@@ -23729,11 +23729,12 @@ main ()
+   return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  fpu=FPA
+-else
+-  fpu=NONE
+-fi
++#if ac_fn_c_try_compile "$LINENO"; then :
++#  fpu=FPA
++#else
++#  fpu=NONE
++#fi
++fpu=VFP
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fpu" >&5
diff --git a/mono.spec b/mono.spec
index 1605938..fcaa447 100644
--- a/mono.spec
+++ b/mono.spec
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.10.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -12,7 +12,11 @@ Source0:        http://origin-download.mono-project.com/sources/mono/mono-%{vers
 # sn -k mono.snk
 # You should not regenerate this unless you have a really, really, really good reason.
 Source2:        mono.snk
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: mono-2.8-ppc-thread.patch
+Patch1: mono-281-libgdiplusconfig.patch
+Patch2: mono-2.10-monodis.patch
+Patch3: mono-2.10-armhfp.patch
 
 BuildRequires:  bison 
 BuildRequires:  glib2-devel
@@ -36,10 +40,6 @@ BuildRequires: mono-core
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ia64 %{arm} sparcv9 alpha s390x ppc ppc64
 
-Patch0: mono-2.8-ppc-thread.patch
-Patch6: mono-281-libgdiplusconfig.patch
-Patch7: mono-2.10-monodis.patch
-
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
 virtual machine (as well as a byte code interpreter, the
@@ -256,8 +256,11 @@ Development file for monodoc
 %setup -q
 
 %patch0 -p1 -b .ppc-threading
-%patch6 -F 1 -p1 -b .libgdiplus
-%patch7 -p1 -b .monodis
+%patch1 -F 1 -p1 -b .libgdiplus
+%patch2 -p1 -b .monodis
+%ifarch armv7hl
+%patch3 -p1 -b .armhfp
+%endif
 
 # Add undeclared Arg
 sed -i "61a #define ARG_MAX     _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
@@ -289,30 +292,30 @@ make DESTDIR=%{buildroot}  install
 mkdir -p %{buildroot}%{_sysconfdir}/pki/mono
 install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 
-%{__rm} %{buildroot}%{_libdir}/*.la
-%{__rm} %{buildroot}%{_libdir}/*.a
+rm %{buildroot}%{_libdir}/*.la
+rm %{buildroot}%{_libdir}/*.a
 
 # We put these inside rpm
-%{__rm} %{buildroot}%{_bindir}/mono-find-provides
-%{__rm} %{buildroot}%{_bindir}/mono-find-requires
+rm %{buildroot}%{_bindir}/mono-find-provides
+rm %{buildroot}%{_bindir}/mono-find-requires
 
 # This was removed upstream:
-%{__rm} -rf %{buildroot}%{monodir}/gac/Mono.Security.Win32
-%{__rm} -rf %{buildroot}%{monodir}/2.0/Mono.Security.Win32.dll
-%{__rm} -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32.dll
-%{__rm} %{buildroot}%{_datadir}/libgc-mono/README*
-%{__rm} %{buildroot}%{_datadir}/libgc-mono/barrett_diagram
-%{__rm} %{buildroot}%{_datadir}/libgc-mono/*.html
-%{__rm} %{buildroot}%{_datadir}/libgc-mono/gc.man
-%{__rm} -f %{buildroot}%{monodir}/2.0/mscorlib.dll.so
-%{__rm} -f %{buildroot}%{monodir}/2.0/mcs.exe.so
-%{__rm} -f %{buildroot}%{monodir}/2.0/gmcs.exe.so
-%{__rm} -rf %{buildroot}%{monodir}/xbuild/Microsoft
-%{__rm} -f %{buildroot}%{monodir}/4.0/mscorlib.dll.so
-%{__rm} -f %{buildroot}%{monodir}/4.0/dmcs.exe.so
-%{__rm} -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32
-%{__rm} -rf %{buildroot}%{_bindir}/mono-configuration-crypto
-%{__rm} -rf %{buildroot}%{_mandir}/man?/mono-configuration-crypto*
+rm -rf %{buildroot}%{monodir}/gac/Mono.Security.Win32
+rm -rf %{buildroot}%{monodir}/2.0/Mono.Security.Win32.dll
+rm -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32.dll
+rm %{buildroot}%{_datadir}/libgc-mono/README*
+rm %{buildroot}%{_datadir}/libgc-mono/barrett_diagram
+rm %{buildroot}%{_datadir}/libgc-mono/*.html
+rm %{buildroot}%{_datadir}/libgc-mono/gc.man
+rm -f %{buildroot}%{monodir}/2.0/mscorlib.dll.so
+rm -f %{buildroot}%{monodir}/2.0/mcs.exe.so
+rm -f %{buildroot}%{monodir}/2.0/gmcs.exe.so
+rm -rf %{buildroot}%{monodir}/xbuild/Microsoft
+rm -f %{buildroot}%{monodir}/4.0/mscorlib.dll.so
+rm -f %{buildroot}%{monodir}/4.0/dmcs.exe.so
+rm -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32
+rm -rf %{buildroot}%{_bindir}/mono-configuration-crypto
+rm -rf %{buildroot}%{_mandir}/man?/mono-configuration-crypto*
 
 %find_lang mcs
 
@@ -712,6 +715,10 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 
 
 %changelog
+* Mon Apr 16 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 2.10.8-2
+- Add build work around for building on ARM hardfp
+- spec cleanups
+
 * Tue Jan 03 2012 Christian Krause <chkr at fedoraproject.org> - 2.10.8-1
 - Update to 2.10.8