diff --git a/mono-4.2.2-asmx.patch b/mono-4.2.2-asmx.patch deleted file mode 100644 index 97ca5fa..0000000 --- a/mono-4.2.2-asmx.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 054efb814f0498927d8046fc015a4926968d51b1 Mon Sep 17 00:00:00 2001 -From: Timotheus Pokorra -Date: Mon, 8 Feb 2016 21:55:36 +0100 -Subject: [PATCH] fixing display of asmx help page (#37137) - -if MONO_BROKEN_CONFIGURATION_DLL is defined, make sure that actualPath always gets set ---- - .../System/Web/Services/Configuration/WsdlHelpGeneratorElement.cs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/System.Web.Services/System/Web/Services/Configuration/WsdlHelpGeneratorElement.cs b/System.Web.Services/System/Web/Services/Configuration/WsdlHelpGeneratorElement.cs -index c1e6007..e03a305 100644 ---- a/external/referencesource/System.Web.Services/System/Web/Services/Configuration/WsdlHelpGeneratorElement.cs -+++ b/external/referencesource/System.Web.Services/System/Web/Services/Configuration/WsdlHelpGeneratorElement.cs -@@ -75,6 +75,7 @@ protected override void DeserializeElement(XmlReader reader, bool serializeColle - try { - var hack = this.EvaluationContext; - } catch (ConfigurationErrorsException) { -+ this.actualPath = GetConfigurationDirectory(); - return; - } - #endif -@@ -127,6 +128,7 @@ protected override void Reset(ConfigurationElement parentElement) - var hack = this.EvaluationContext; - } catch (ConfigurationErrorsException) { - base.Reset(parentElement); -+ this.actualPath = GetConfigurationDirectory(); - return; - } - #endif diff --git a/mono-4.3.2-s390-get_pinvoke_import.patch b/mono-4.3.2-s390-get_pinvoke_import.patch new file mode 100644 index 0000000..f8375c4 --- /dev/null +++ b/mono-4.3.2-s390-get_pinvoke_import.patch @@ -0,0 +1,26 @@ +From 9a8067719ced08ebd866013637db865f74774d2d Mon Sep 17 00:00:00 2001 +From: Zoltan Varga +Date: Fri, 5 Feb 2016 15:22:11 -0500 +Subject: [PATCH] Fix the build. + +--- + mono/mini/aot-compiler.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c +index de12cc9..a39ea0a 100644 +--- a/mono/mini/aot-compiler.c ++++ b/mono/mini/aot-compiler.c +@@ -4759,6 +4759,12 @@ get_pinvoke_import (MonoAotCompile *acfg, MonoMethod *method) + + return import; + } ++#else ++static const char * ++get_pinvoke_import (MonoAotCompile *acfg, MonoMethod *method) ++{ ++ return NULL; ++} + #endif + + static gint diff --git a/mono.spec b/mono.spec index 2514068..3d8c770 100644 --- a/mono.spec +++ b/mono.spec @@ -17,7 +17,7 @@ Name: mono Version: 4.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross-platform, Open Source, .NET development framework Group: Development/Languages @@ -33,8 +33,8 @@ Patch0: mono-4.0.0-ignore-reference-assemblies.patch Patch1: mono-4.0.0-libgdiplusconfig.patch Patch2: mono-4.2.1-ppc.patch Patch3: mono-4.2.1-s390.patch -Patch4: mono-4.2.2-asmx.patch -Patch5: mono-4.3.2-find-provides.patch +Patch4: mono-4.3.2-find-provides.patch +Patch5: mono-4.3.2-s390-get_pinvoke_import.patch BuildRequires: bison BuildRequires: gcc-c++ @@ -758,6 +758,10 @@ mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_bindir} %{_libdir}/pkgconfig/monodoc.pc %changelog +* Mon Feb 29 2016 Timotheus Pokorra - 4.3.2-5 +- remove patch for asmx service documentation: that has been fixed upstream +- add a patch for s390x (#1311841) + * Sat Feb 27 2016 Timotheus Pokorra - 4.3.2-4 - add symbolic link for 4.0-api to avoid having to replace TargetFramework 4.0 in csproj files