Accepting request 259287 from home:MargueriteSu:branches:Mono:Factory

resubmit

OBS-URL: https://build.opensuse.org/request/show/259287
OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=134

mono-3.x-keyboards.resources-cp_r.patch

@@ -0,0 +1,18 @@
+Index: mono-3.10.0/mcs/class/Managed.Windows.Forms/Makefile
+===================================================================
+--- mono-3.10.0.orig/mcs/class/Managed.Windows.Forms/Makefile
++++ mono-3.10.0/mcs/class/Managed.Windows.Forms/Makefile
+@@ -122,11 +122,11 @@ TEST_HARNESS_EXCLUDES_ONDOTNET = -exclud
+ $(the_lib): $(RESOURCES)
+ 
+ $(RESX_RESOURCES): %.resources: %.resx
+-	$(RESGEN) $< || cp $@.prebuilt $@
++	$(RESGEN) $< || cp -r $@.prebuilt $@
+ 
+ $(LIBRARY): $(CUR_RESOURCES)
+ 
+ $(PREBUILT): %.prebuilt: %
+-	cp $* $@
++	cp -r $* $@
+ 
+ dist-default: $(PREBUILT)

mono-core-target-4.0.patch

@@ -1,19 +0,0 @@
-Subject: use runtime 4.0 as default for cairo and nunit
-
----
- data/mono-nunit.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/mono-nunit.pc.in b/data/mono-nunit.pc.in
-index 5f4e116..e454c30 100644
---- a/data/mono-nunit.pc.in
-+++ b/data/mono-nunit.pc.in
-@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
- Name: Mono NUnit
- Description: Mono's version of NUnit
- Version: @VERSION@
--Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll 
-+Libs: -r:${libdir}/mono/4.0/nunit.core.dll -r:${libdir}/mono/4.0/nunit.core.interfaces.dll -r:${libdir}/mono/4.0/nunit.core.extensions.dll -r:${libdir}/mono/4.0/nunit.framework.dll -r:${libdir}/mono/4.0/nunit.framework.extensions.dll -r:${libdir}/mono/4.0/nunit.mocks.dll -r:${libdir}/mono/4.0/nunit.util.dll -r:${libdir}/mono/4.0/nunit-console-runner.dll 
--- 
-2.0.0
-

mono-core.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 27 00:02:10 UTC 2014 - i@marguerite.su
+
+- fix build for factory x86_64
+  * add mono-3.x-keyboards.resources-cp_r.patch
+  * resources/keyboards.resources exists on x86_64, so cp won't work
+    should add -r argument
+- drop mono-core-target-4.0.patch
+  * runtime 4.0 is no more, now mono-nunit should use 4.5
+- add patch mono-nunit-default-runtime-4.5.patch
+  * use runtime 4.5 for mono-nunit by default
+
 -------------------------------------------------------------------
 Sat Oct  4 18:46:11 UTC 2014 - mailaender@opensuse.org
 

mono-core.spec

@@ -29,14 +29,14 @@ Group:          Development/Languages/Mono
 Url:            http://www.mono-project.com
 Source0:        http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
 Source1:        mono-core.rpmlintrc
-# PATCH-FIX-UPSTREAM mono-core-target-4.0.patch dimstar@opensuse.org -- Use runtime 4.0 as default for cairo and nunit -- https://github.com/mono/mono/pull/1209
+# PATCH-FIX-UPSTREAM Use runtime 4.5 as default for nunit
-Patch5:         mono-core-target-4.0.patch
+Patch5:         mono-nunit-default-runtime-4.5.patch
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch7:         mono-core-ppc64le.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch8:         mono-core-ppc64le-swr11r12.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch9:         mono-core-ppc64le-callreg.diff
+# PATCH-FIX-UPSTREAM resources/keyboards.resources exists on x86_64,
+# so cp won't work, should add -r argument
+Patch10:        mono-3.x-keyboards.resources-cp_r.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -101,6 +101,7 @@ technologies that have been submitted to the ECMA for standardization.
 %patch8 -p1
 %patch9 -p1
 %endif
+%patch10 -p1
 
 %build
 ./autogen.sh

mono-nunit-default-runtime-4.5.patch

@@ -0,0 +1,10 @@
+Index: mono-3.10.0/data/mono-nunit.pc.in
+===================================================================
+--- mono-3.10.0.orig/data/mono-nunit.pc.in
++++ mono-3.10.0/data/mono-nunit.pc.in
+@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
+ Name: Mono NUnit
+ Description: Mono's version of NUnit
+ Version: @VERSION@
+-Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll 
++Libs: -r:${libdir}/mono/4.5/nunit.core.dll -r:${libdir}/mono/4.5/nunit.core.interfaces.dll -r:${libdir}/mono/4.5/nunit.core.extensions.dll -r:${libdir}/mono/4.5/nunit.framework.dll -r:${libdir}/mono/4.5/nunit.framework.extensions.dll -r:${libdir}/mono/4.5/nunit.mocks.dll -r:${libdir}/mono/4.5/nunit.util.dll -r:${libdir}/mono/4.5/nunit-console-runner.dll