From 75b89b2df1f6a3eb0d7fae02745bbf785f0fdbeb643c29b4f05eeb6287f56d35 Mon Sep 17 00:00:00 2001 From: Stephen Shaw Date: Sat, 15 Dec 2012 20:15:46 +0000 Subject: [PATCH 1/4] - Updated to mono 3.0.2 * Bug fixes to the 3.0.x series OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=94 --- mono-3.0.1.tar.bz2 | 3 --- mono-3.0.2.tar.bz2 | 3 +++ mono-core.changes | 6 ++++++ mono-core.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 mono-3.0.1.tar.bz2 create mode 100644 mono-3.0.2.tar.bz2 diff --git a/mono-3.0.1.tar.bz2 b/mono-3.0.1.tar.bz2 deleted file mode 100644 index fa9ac98..0000000 --- a/mono-3.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7327d99d1733b12a9dd2d59c1b50836168859f9686a57163248ae1e6c6be97b -size 41323928 diff --git a/mono-3.0.2.tar.bz2 b/mono-3.0.2.tar.bz2 new file mode 100644 index 0000000..4963674 --- /dev/null +++ b/mono-3.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:642f77c2ba2f90637638f453c579e9385c36ecf8b5cafe16307323746f43c44f +size 67323152 diff --git a/mono-core.changes b/mono-core.changes index e5e5688..938f108 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 15 20:13:00 UTC 2012 - sshaw@decriptor.com + +- Updated to mono 3.0.2 + * Bug fixes to the 3.0.x series + ------------------------------------------------------------------- Sun Nov 11 21:40:30 UTC 2012 - sshaw@decriptor.com diff --git a/mono-core.spec b/mono-core.spec index 61d4f00..9ba462c 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -26,7 +26,7 @@ %endif Name: mono-core -Version: 3.0.1 +Version: 3.0.2 Release: 0 Summary: A License: LGPL-2.1 From d307f35124270d2d2ddb9bff210caf77f1f4654d1b76ca4cf82006f3b31f6c4e Mon Sep 17 00:00:00 2001 From: Stephen Shaw Date: Sun, 16 Dec 2012 00:14:07 +0000 Subject: [PATCH 2/4] Updated for new files OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=95 --- mono-core.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mono-core.spec b/mono-core.spec index 9ba462c..4164792 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -252,6 +252,7 @@ rm -rf %{buildroot} %{_prefix}/lib/mono/2.0/System.Configuration.dll %{_prefix}/lib/mono/2.0/System.Core.dll %{_prefix}/lib/mono/2.0/System.Drawing.dll +%{_prefix}/lib/mono/2.0/System.Json.dll %{_prefix}/lib/mono/2.0/System.Net.dll %{_prefix}/lib/mono/2.0/System.Security.dll %{_prefix}/lib/mono/2.0/System.Xml.Linq.dll @@ -283,7 +284,7 @@ rm -rf %{buildroot} %{_prefix}/lib/mono/4.0/System.Core.dll %{_prefix}/lib/mono/4.0/System.Drawing.dll %{_prefix}/lib/mono/4.0/System.Dynamic.dll -%{_prefix}/lib/mono/4.0/System.Json.dll +%{_prefix}/lib/mono/4.0/System.Json.Microsoft.dll %{_prefix}/lib/mono/4.0/System.Net.dll %{_prefix}/lib/mono/4.0/System.Numerics.dll %{_prefix}/lib/mono/4.0/System.Security.dll @@ -324,7 +325,7 @@ rm -rf %{buildroot} %{_prefix}/lib/mono/4.5/System.Core.dll %{_prefix}/lib/mono/4.5/System.Drawing.dll %{_prefix}/lib/mono/4.5/System.Dynamic.dll -%{_prefix}/lib/mono/4.5/System.Json.dll +%{_prefix}/lib/mono/4.5/System.Json.Microsoft.dll %{_prefix}/lib/mono/4.5/System.Net.dll %{_prefix}/lib/mono/4.5/System.Net.Http.dll %{_prefix}/lib/mono/4.5/System.Numerics.dll @@ -369,6 +370,7 @@ rm -rf %{buildroot} %{_prefix}/lib/mono/gac/System.Xml %{_prefix}/lib/mono/gac/System.Xml.Linq %{_prefix}/lib/mono/gac/System.Json +%{_prefix}/lib/mono/gac/System.Json.Microsoft %{_prefix}/lib/mono/gac/cscompmgd %{_prefix}/lib/mono/mono-configuration-crypto From 3abddb2fbb11e392c3a09d55e2786916a6155d1d59146acb04a14cb41b4b9880 Mon Sep 17 00:00:00 2001 From: Stephen Shaw Date: Sun, 16 Dec 2012 00:32:14 +0000 Subject: [PATCH 3/4] Should be fixed now OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=96 --- mono-core.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mono-core.spec b/mono-core.spec index 4164792..da78ad8 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -284,6 +284,7 @@ rm -rf %{buildroot} %{_prefix}/lib/mono/4.0/System.Core.dll %{_prefix}/lib/mono/4.0/System.Drawing.dll %{_prefix}/lib/mono/4.0/System.Dynamic.dll +%{_prefix}/lib/mono/4.0/System.Json.dll %{_prefix}/lib/mono/4.0/System.Json.Microsoft.dll %{_prefix}/lib/mono/4.0/System.Net.dll %{_prefix}/lib/mono/4.0/System.Numerics.dll @@ -325,6 +326,7 @@ rm -rf %{buildroot} %{_prefix}/lib/mono/4.5/System.Core.dll %{_prefix}/lib/mono/4.5/System.Drawing.dll %{_prefix}/lib/mono/4.5/System.Dynamic.dll +%{_prefix}/lib/mono/4.5/System.Json.dll %{_prefix}/lib/mono/4.5/System.Json.Microsoft.dll %{_prefix}/lib/mono/4.5/System.Net.dll %{_prefix}/lib/mono/4.5/System.Net.Http.dll From 1d27c41b454c9b37bd685351f08ae8eaf46f49a70cf9589d9b91c36bccb89a86 Mon Sep 17 00:00:00 2001 From: Stephen Shaw Date: Thu, 20 Dec 2012 04:25:06 +0000 Subject: [PATCH 4/4] Accepting request 145938 from devel:Factory:ARM fix arm builds. please forward to Factory, thanks. OBS-URL: https://build.opensuse.org/request/show/145938 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=97 --- mono-arm-cpuinfo-v5.patch | 8 ++++---- mono-arm-cpuinfo-v7.patch | 8 ++++---- mono-arm-vfp.patch | 20 +++++++++++++++----- mono-core.changes | 6 ++++++ mono-core.spec | 14 +++++++++----- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/mono-arm-cpuinfo-v5.patch b/mono-arm-cpuinfo-v5.patch index 38e2067..0619c4c 100644 --- a/mono-arm-cpuinfo-v5.patch +++ b/mono-arm-cpuinfo-v5.patch @@ -1,8 +1,8 @@ -Index: mono-2.10.6/mono/mini/mini-arm.c +Index: mono-3.0.2/mono/mini/mini-arm.c =================================================================== ---- mono-2.10.6.orig/mono/mini/mini-arm.c -+++ mono-2.10.6/mono/mini/mini-arm.c -@@ -592,6 +592,9 @@ mono_arch_cpu_optimizazions (guint32 *ex +--- mono-3.0.2.orig/mono/mini/mini-arm.c ++++ mono-3.0.2/mono/mini/mini-arm.c +@@ -721,6 +721,9 @@ mono_arch_cpu_optimizations (guint32 *ex v5_supported = TRUE; darwin = TRUE; iphone_abi = TRUE; diff --git a/mono-arm-cpuinfo-v7.patch b/mono-arm-cpuinfo-v7.patch index 6120866..3ea3c7f 100644 --- a/mono-arm-cpuinfo-v7.patch +++ b/mono-arm-cpuinfo-v7.patch @@ -1,8 +1,8 @@ -Index: mono-2.10.6/mono/mini/mini-arm.c +Index: mono-3.0.2/mono/mini/mini-arm.c =================================================================== ---- mono-2.10.6.orig/mono/mini/mini-arm.c -+++ mono-2.10.6/mono/mini/mini-arm.c -@@ -717,6 +717,11 @@ mono_arch_cpu_optimizazions (guint32 *ex +--- mono-3.0.2.orig/mono/mini/mini-arm.c ++++ mono-3.0.2/mono/mini/mini-arm.c +@@ -721,6 +721,11 @@ mono_arch_cpu_optimizations (guint32 *ex v5_supported = TRUE; darwin = TRUE; iphone_abi = TRUE; diff --git a/mono-arm-vfp.patch b/mono-arm-vfp.patch index 57961b9..27a6fd8 100644 --- a/mono-arm-vfp.patch +++ b/mono-arm-vfp.patch @@ -1,8 +1,18 @@ -Index: mono-2.10.6/configure +Index: mono-3.0.2/configure =================================================================== ---- mono-2.10.6.orig/configure -+++ mono-2.10.6/configure -@@ -23989,11 +23989,12 @@ main () +--- mono-3.0.2.orig/configure ++++ mono-3.0.2/configure +@@ -25018,9 +25018,6 @@ if test ${TARGET} = ARM && test x$cross_ + $as_echo_n "checking which FPU to use... " >&6; } + + fpu=NONE +- if gcc -v 2>&1 | grep -q -- '--with-float=hard'; then +- fpu=VFP_HARD +- fi + + if test x$fpu = xNONE; then + ORIG_CFLAGS=$CFLAGS +@@ -25063,11 +25060,12 @@ main () return 0; } _ACEOF @@ -18,5 +28,5 @@ Index: mono-2.10.6/configure +#fi +fpu=VFP rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fpu" >&5 diff --git a/mono-core.changes b/mono-core.changes index 938f108..fedaa5f 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 17 12:34:59 UTC 2012 - adrian@suse.de + +- fix patches for arm* +- do not detect hard fp support in gcc (mono is not supporting it yet for real) + ------------------------------------------------------------------- Sat Dec 15 20:13:00 UTC 2012 - sshaw@decriptor.com diff --git a/mono-core.spec b/mono-core.spec index da78ad8..f7b6e04 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -118,13 +118,13 @@ technologies that have been submitted to the ECMA for standardization. #rm -f libgc/libtool.m4 #autoreconf --force --install #autoreconf --force --install libgc +export CFLAGS=" %{optflags} -fno-strict-aliasing" %ifarch armv7l armv7hl export MONO_CPU_ARCH="armv7l-thumb" %endif %ifarch armv5el export MONO_CPU_ARCH="armv5el" %endif -export CFLAGS=" %{optflags} -fno-strict-aliasing" # distro specific configure options %if %llvm == yes export PATH=/opt/novell/llvm-mono/bin:$PATH @@ -173,6 +173,10 @@ RPM_BUILD_ROOT=%{buildroot}%{_prefix} /usr/lib/rpm/brp-compress rm %{buildroot}%{_prefix}%{_prefix} %fdupes %{buildroot}%{_prefix} %find_lang mcs +%if %sgen == no +# installed anyway but not packaged +rm %{buildroot}%{_bindir}/mono-sgen-gdb.py +%endif %clean rm -rf %{buildroot} @@ -772,7 +776,7 @@ Database connectivity for Mono. %package -n mono-wcf Summary: Mono implementation of WCF, Windows Communication Foundation -License: MIT ; MS-PL +License: MIT and MS-PL Group: Development/Languages/Mono Requires: mono-core = %{version} @@ -822,7 +826,7 @@ Mono implementation of WCF, Windows Communication Foundation %package -n mono-winfxcore Summary: Mono implementation of core WinFX APIs -License: MIT ; MS-PL +License: MIT and MS-PL Group: Development/Languages/Mono Requires: mono-core = %{version} @@ -848,7 +852,7 @@ Mono implementation of core WinFX APIs %package -n mono-web Summary: Mono implementation of ASP -License: MIT ; MS-PL +License: MIT and MS-PL Group: Development/Languages/Mono Requires: mono-core = %{version} Obsoletes: mono-remoting @@ -966,7 +970,7 @@ Mono implementation of ASP.NET, Remoting and Web Services. %package -n mono-mvc Summary: Mono implementation of ASP -License: MIT ; MS-PL +License: MIT and MS-PL Group: Development/Languages/Mono Requires: mono-core = %{version}