packages: mono/mono.spec - don't pass --with-moonlight, it just broke build...

[qboosh]

Author: qboosh                       Date: Mon Oct 18 18:48:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't pass --with-moonlight, it just broke building of some utils
- restored profilter libs and monodis utility

---- Files affected:
packages/mono:
   mono.spec (1.269 -> 1.270) 

---- Diffs:

================================================================
Index: packages/mono/mono.spec
diff -u packages/mono/mono.spec:1.269 packages/mono/mono.spec:1.270
--- packages/mono/mono.spec:1.269	Mon Oct 18 19:13:56 2010
+++ packages/mono/mono.spec	Mon Oct 18 20:48:08 2010
@@ -234,8 +234,6 @@
 ln -sf ../{nls,po,progtest}.m4 m4
 
 %build
-#cp -f /usr/share/automake/config.sub .
-#cp -f /usr/share/automake/config.sub libgc
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoheader}
@@ -257,6 +255,8 @@
 # -DUSE_COMPILER_TLS is passed to libgc by main configure, but our
 # CPPFLAGS override that CPPFLAGS
 CPPFLAGS="-DUSE_LIBC_PRIVATE_SYMBOLS -DUSE_COMPILER_TLS"
+# note: don't enable moonlight here (yet) - it doesn't add anything to package
+# but disables some utils (it's meant for stripped mono build for moonlight)
 %configure \
 	%{!?with_static_libs:--disable-static} \
 	--enable-fast-install \
@@ -266,7 +266,6 @@
 	--with-interp%{!?with_mint:=no} \
 	--with-jit%{?with_mint:=no} \
 	--with-profile4 \
-	--with-moonlight \
 	--without-monotouch \
 	--with-tls=%{?with_tls:__thread}%{!?with_tls:pthread}
 
@@ -364,6 +363,14 @@
 %attr(755,root,root) %{_libdir}/libmonosgen-2.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmonosgen-2.0.so.0
 %endif
+%attr(755,root,root) %{_libdir}/libmono-profiler-aot.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmono-profiler-aot.so.0
+%attr(755,root,root) %{_libdir}/libmono-profiler-cov.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmono-profiler-cov.so.0
+%attr(755,root,root) %{_libdir}/libmono-profiler-iomap.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmono-profiler-iomap.so.0
+%attr(755,root,root) %{_libdir}/libmono-profiler-logging.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmono-profiler-logging.so.0
 %attr(755,root,root) %{_libdir}/libMonoPosixHelper.so
 %attr(755,root,root) %{_libdir}/libMonoSupportW.so
 %attr(755,root,root) %{_libdir}/libikvm-native.so
@@ -485,6 +492,8 @@
 %attr(755,root,root) %{_bindir}/mono-cil-strip
 %attr(755,root,root) %{_bindir}/mono-heapviz
 %attr(755,root,root) %{_bindir}/mono-sgen
+%attr(755,root,root) %{_bindir}/monodis
+%attr(755,root,root) %{_bindir}/monograph
 %attr(755,root,root) %{_bindir}/monolinker
 %attr(755,root,root) %{_bindir}/monop
 %attr(755,root,root) %{_bindir}/monop2
@@ -512,6 +521,14 @@
 %{_libdir}/libmono-2.0.la
 %{_libdir}/libmonosgen-2.0.la
 %endif
+%attr(755,root,root) %{_libdir}/libmono-profiler-aot.so
+%attr(755,root,root) %{_libdir}/libmono-profiler-cov.so
+%attr(755,root,root) %{_libdir}/libmono-profiler-iomap.so
+%attr(755,root,root) %{_libdir}/libmono-profiler-logging.so
+%{_libdir}/libmono-profiler-aot.la
+%{_libdir}/libmono-profiler-cov.la
+%{_libdir}/libmono-profiler-iomap.la
+%{_libdir}/libmono-profiler-logging.la
 %attr(755,root,root) %{_prefix}/lib/mono/2.0/al.exe
 %attr(755,root,root) %{_prefix}/lib/mono/2.0/culevel.exe
 %attr(755,root,root) %{_prefix}/lib/mono/2.0/genxs.exe
@@ -569,6 +586,7 @@
 %{_prefix}/lib/mono/4.0/Microsoft.Common.tasks
 %{_prefix}/lib/mono/4.0/Microsoft.VisualBasic.targets
 %{_prefix}/lib/mono/xbuild
+%{_datadir}/mono-2.0
 %attr(755,root,root) %{_rpmlibdir}/mono-find-provides
 %attr(755,root,root) %{_rpmlibdir}/mono-find-requires
 %{_pkgconfigdir}/cecil.pc
@@ -599,12 +617,13 @@
 %{_mandir}/man1/genxs.1*
 %{_mandir}/man1/lc.1*
 %{_mandir}/man1/macpack.1*
-%{_mandir}/man1/monolinker.1*
-%{_mandir}/man1/monop.1*
 %{_mandir}/man1/mono-api-info.1*
 %{_mandir}/man1/mono-cil-strip.1*
 %{_mandir}/man1/mono-shlib-cop.1*
 %{_mandir}/man1/mono-xmltool.1*
+%{_mandir}/man1/monodis.1*
+%{_mandir}/man1/monolinker.1*
+%{_mandir}/man1/monop.1*
 %{_mandir}/man1/permview.1*
 %{_mandir}/man1/prj2make.1*
 %{_mandir}/man1/resgen.1*
@@ -683,6 +702,10 @@
 %{_libdir}/libmono-2.0.a
 %{_libdir}/libmonosgen-2.0.a
 %endif
+%{_libdir}/libmono-profiler-aot.a
+%{_libdir}/libmono-profiler-cov.a
+%{_libdir}/libmono-profiler-iomap.a
+%{_libdir}/libmono-profiler-logging.a
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -691,6 +714,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.270  2010/10/18 18:48:08  qboosh
+- don't pass --with-moonlight, it just broke building of some utils
+- restored profilter libs and monodis utility
+
 Revision 1.269  2010/10/18 17:13:56  pluto
 - restore monodis/profiler build, %%files nfy...
 
================================================================

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