packages: mono/mono.spec, mono/mono-fix-moonlight-side-effects.patch (NEW) ...

[pluto]

Author: pluto                        Date: Mon Oct 18 17:14:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restore monodis/profiler build, %%files nfy...

---- Files affected:
packages/mono:
   mono.spec (1.268 -> 1.269) , mono-fix-moonlight-side-effects.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mono/mono.spec
diff -u packages/mono/mono.spec:1.268 packages/mono/mono.spec:1.269
--- packages/mono/mono.spec:1.268	Sun Oct 17 23:18:04 2010
+++ packages/mono/mono.spec	Mon Oct 18 19:13:56 2010
@@ -32,6 +32,7 @@
 Patch4:		%{name}-console-no-utf8-bom.patch
 Patch5:		%{name}-pc.patch
 Patch6:		%{name}-ARG_MAX.patch
+Patch7:		%{name}-fix-moonlight-side-effects.patch
 URL:		http://www.mono-project.com/
 %if %(test -r /dev/random; echo $?)
 BuildRequires:	ACCESSIBLE_/dev/random
@@ -62,7 +63,7 @@
 # debugger doesn't work with stripped mono
 %define         _noautostrip    .*/mono
 
-%define		skip_post_check_so	'.+libmonosgen.+\.so.+'
+%define		skip_post_check_so	'.+(libmonosgen|libmono-profiler).+\.so.+'
 
 %if %{without bootstrap}
 %define	__mono_provides	%{_rpmlibdir}/mono-find-provides
@@ -221,6 +222,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p0
 
 # for jay
 cat >> mcs/build/config-default.make <<'EOF'
@@ -689,6 +691,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.269  2010/10/18 17:13:56  pluto
+- restore monodis/profiler build, %%files nfy...
+
 Revision 1.268  2010/10/17 21:18:04  pluto
 - release 2.
 

================================================================
Index: packages/mono/mono-fix-moonlight-side-effects.patch
diff -u /dev/null packages/mono/mono-fix-moonlight-side-effects.patch:1.1
--- /dev/null	Mon Oct 18 19:14:02 2010
+++ packages/mono/mono-fix-moonlight-side-effects.patch	Mon Oct 18 19:13:56 2010
@@ -0,0 +1,15 @@
+Currently "--with-moonlight" does not mean "Add Moonlight into the Mix", it
+means "build Mono as required by Moonlight" which cuts a lot of extra cruft
+from the build process that is not required by the Moonlight team.
+
+--- mono/Makefile.am.old	2010-10-10 19:51:15.000000000 +1300
++++ mono/Makefile.am	2010-10-10 19:54:07.000000000 +1300
+@@ -2,7 +2,7 @@
+ SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis
+ else
+ if MOONLIGHT
+-SUBDIRS = utils io-layer     metadata arch $(interpreter_dir) mini
++SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis monograph tests benchmark profiler
+ else
+ SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis monograph tests benchmark profiler
+ endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mono/mono.spec?r1=1.268&r2=1.269&f=u