update:mono

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3689 ec354946-7b23-47d6-9f5a-488ba84defc7

m/mono/mono-vl.spec

@@ -2,15 +2,13 @@ Summary: .NET runtime environment
 Summary(ja): .NET ランタイム環境
 Name: mono
 Version: 2.10.1
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Group: Development/Languages
 License: GPL, LGPL, MIT X11
 URL: http://www.mono-project.com/
 Source0: http://ftp.novell.com/pub/mono/sources/mono/%{name}-%{version}.tar.bz2
 Source1: monodir.c
-
 Patch1: mono-2.10.1-ppc-len.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bison
 BuildRequires: glib2-devel
@@ -214,10 +212,10 @@ gcc -o monodir %{SOURCE1} -DMONODIR=\"%{mono_dir}\"
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure \
 	--with-jit=yes \
-	--with-ikvm=yes \
+	--with-ikvm-native=yes \
 	--with-sigaltstack=no \
-%ifarch ppc
 	--with-sgen=no \
+%ifarch ppc
 	--disable-system-aot \
 %endif
 	;
@@ -240,13 +238,24 @@ install monodir %{buildroot}%{_bindir}
 %{__rm} -f %{buildroot}%{_bindir}/mono-find-requires
 
 ## This was removed upstream:
-%{__rm} -rf %{buildroot}%{mono_dir}/gac/Mono.Security.Win32/2*
-%{__rm} -rf %{buildroot}%{mono_dir}/2.0/Mono.Security.Win32.dll
-%{__rm} -rf %{buildroot}%{_datadir}/libgc-mono
 %{__rm} -rf %{buildroot}%{_datadir}/mono-2.0/mono/cil
 %{__rm} -f %{buildroot}%{_bindir}/prj2make
 %{__rm} -f %{buildroot}%{_mandir}/man1/prj2make.*
 %{__rm} -f %{buildroot}%{_mandir}/man1/cilc.*
+## This was referring to fedora:
+%{__rm} -rf %{buildroot}%{mono_dir}/gac/Mono.Security.Win32
+%{__rm} -rf %{buildroot}%{mono_dir}/2.0/Mono.Security.Win32.dll
+%{__rm} -rf %{buildroot}%{mono_dir}/4.0/Mono.Security.Win32.dll
+%{__rm} -rf %{buildroot}%{mono_dir}/xbuild/Microsoft
+%{__rm} -f %{buildroot}%{mono_dir}/2.0/mcs.exe.so
+%{__rm} -f %{buildroot}%{mono_dir}/2.0/mscorlib.dll.so
+%{__rm} -f %{buildroot}%{_datadir}/libgc-mono/README*
+%{__rm} -f %{buildroot}%{_datadir}/libgc-mono/barrett_diagram
+%{__rm} -f %{buildroot}%{_datadir}/libgc-mono/*.html
+%{__rm} -f %{buildroot}%{_datadir}/libgc-mono/gc.man
+%{__rm} -rf %{buildroot}%{_bindir}/mono-configuration-crypto
+%{__rm} -rf %{buildroot}%{_mandir}/man?/mono-configuration-crypto*
+
 
 %find_lang mcs
 
@@ -263,23 +272,23 @@ install monodir %{buildroot}%{_bindir}
 %files core -f mcs.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
-##{_bindir}/mcs
+%{_bindir}/mcs
 %{_bindir}/mono
 %{_bindir}/monodir
 %{_bindir}/mono-api-*
-%{_bindir}/mono-configuration-crypto
+##{_bindir}/mono-configuration-crypto
 %{_bindir}/mono-heapviz
-%ifnarch ppc
-%{_bindir}/mono-sgen
-%endif
+##ifnarch ppc
+##{_bindir}/mono-sgen
+##endif
 %{_bindir}/peverify
 %{_bindir}/mprof-report
 %{_bindir}/mono-test-install
 %{_libdir}/libMonoPosixHelper.so
 %{_libdir}/libmono-2.0.so.*
-%ifnarch ppc
-%{_libdir}/libmonosgen-2.0.so.*
-%endif
+##ifnarch ppc
+##{_libdir}/libmonosgen-2.0.so.*
+##endif
 %{_libdir}/libmono-profiler-aot.so.*
 %{_libdir}/libmono-profiler-cov.so.*
 %{_libdir}/libmono-profiler-iomap.so.*
@@ -305,7 +314,7 @@ install monodir %{buildroot}%{_bindir}
 %ifarch ppc
 %{mono_dir}/2.0/mcs.exe
 %else
-%bin_and_exe mcs 2.0/mcs
+%{mono_dir}/2.0/mcs.exe
 %endif
 %bin_and_exe mod 4.0/mod
 %bin_and_exe mono-cil-strip 4.0/mono-cil-strip
@@ -349,7 +358,7 @@ install monodir %{buildroot}%{_bindir}
 %gac_and_2dll Mono.CompilerServices.SymbolWriter 4.0 2.0
 %gac_and_2dll Mono.Posix 4.0 2.0
 %gac_and_2dll Mono.Security 4.0 2.0
-%gac_and_1dll Mono.Security.Win32 4.0
+##gac_and_1dll Mono.Security.Win32 4.0
 %gac_and_2dll Mono.CSharp 4.0 2.0
 %gac_and_1dll Mono.CodeContracts 4.0
 %gac_and_2dll Mono.Debugger.Soft 4.0 2.0
@@ -405,7 +414,7 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/resgen.1.gz
 %{_mandir}/man1/mono-api-info.1.gz
 %{_mandir}/man1/mono-cil-strip.1.gz
-%{_mandir}/man1/mono-configuration-crypto.1.gz
+##{_mandir}/man1/mono-configuration-crypto.1.gz
 %{_mandir}/man5/mono-config.5.gz
 
 %files devel
@@ -421,9 +430,9 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/libmono-profiler-aot.so
 %{_libdir}/libmono-profiler-cov.so
 %{_libdir}/libmono-profiler-iomap.so
-%ifnarch ppc
-%{_libdir}/libmonosgen-2.0.so
-%endif
+##ifnarch ppc
+##{_libdir}/libmonosgen-2.0.so
+##endif
 %{_libdir}/libMonoSupportW.so
 %{_libdir}/libikvm-native.so
 %{mono_dir}/4.0/mkbundle.exe*
@@ -487,9 +496,9 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/mono-2.pc
 %{_libdir}/pkgconfig/mono-lineeditor.pc
 %{_libdir}/pkgconfig/mono-options.pc
-%ifnarch ppc
-%{_libdir}/pkgconfig/monosgen-2.pc
-%endif
+##ifnarch ppc
+##{_libdir}/pkgconfig/monosgen-2.pc
+##endif
 %{_libdir}/pkgconfig/wcf.pc
 %{_includedir}/mono-2.0
 %{_mandir}/man1/al.1.gz
@@ -617,7 +626,7 @@ install monodir %{buildroot}%{_bindir}
 %gac_and_2dll System.DirectoryServices 4.0 2.0
 %gac_and_2dll System.EnterpriseServices 4.0 2.0
 %gac_and_2dll System.Transactions 4.0 2.0
-%{mono_dir}/gac/System.Data.Services.Client
+##{mono_dir}/gac/System.Data.Services.Client
 %{_mandir}/man1/sqlsharp.1.gz
 
 %files data-sqlite
@@ -654,6 +663,10 @@ install monodir %{buildroot}%{_bindir}
 
 
 %changelog
+* Sun Apr 24 2011 Shu KONNO <owa@bg.wakwak.com> 2.10.1-3
+- added '--with-sgen=no' to all arch
+- dropt %%{mono_dir}/2.0/{mcs.exe,mscorlib.dll}.so
+
 * Sat Apr 16 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.10.1-2
 - remove the old ppc patch (similar codes already in the upstream)
 - add Patch1 (from Gentoo)