[mono: 1/2] Bump to 2.10.1 Update libdir and metadata patches Remove moonlight build patch Renamed mono-4-previe
Paul F. Johnson
pfj at fedoraproject.org
Wed Mar 9 19:54:17 UTC 2011
commit 55121410d3dc97c0cb94796dbe72a83247a40de7
Author: Paul F. Johnson <paul at all-the-johnsons.co.uk>
Date: Wed Mar 9 19:42:17 2011 +0000
Bump to 2.10.1
Update libdir and metadata patches
Remove moonlight build patch
Renamed mono-4-preview to mono-dotnet4, removed as an option
Corrected mono-dotnet4 description
spec file clean up
mono-2.10-libdir.patch | 247 +++++++++++++++++++++++++++++
mono-2.10-metadata-makefile.patch | 40 +++++
mono-2.10-monodis.patch | 11 ++
mono-2.8.1.tar.bz2 => mono-2.10.1.tar.bz2 | Bin 31181201 -> 33483937 bytes
mono.spec | 82 +++++-----
5 files changed, 337 insertions(+), 43 deletions(-)
---
diff --git a/mono-2.10-libdir.patch b/mono-2.10-libdir.patch
new file mode 100644
index 0000000..0c35283
--- /dev/null
+++ b/mono-2.10-libdir.patch
@@ -0,0 +1,247 @@
+--- mono-2.8/mcs/tools/gacutil/driver.cs 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/mcs/tools/gacutil/driver-new.cs 2010-09-15 13:32:30.335396575 +0100
+@@ -808,8 +808,8 @@
+ private static string EnsureLib (string dir)
+ {
+ DirectoryInfo d = new DirectoryInfo (dir);
+- if (d.Name == "lib")
++ if (d.Name == "lib" || d.Name == "lib64")
+ return dir;
+ return Path.Combine (dir, "lib");
+ }
+
+--- mono-2.6.4/data/mint.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/mint.pc-new.in 2010-04-27 00:34:27.000000000 +0100
+@@ -1,6 +1,6 @@
+ prefix=${pcfiledir}/../..
+ exec_prefix=${pcfiledir}/../..
+-libdir=${prefix}/lib
++libdir=@LIBDIR@
+ includedir=${prefix}/include/mono- at API_VER@
+
+
+--- mono-2.6.4/data/mono.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/mono.pc-new.in 2010-04-27 00:34:57.000000000 +0100
+@@ -1,6 +1,6 @@
+ prefix=${pcfiledir}/../..
+ exec_prefix=${pcfiledir}/../..
+-libdir=${prefix}/@reloc_libdir@
++libdir=@LIBDIR@
+ includedir=${prefix}/include/mono- at API_VER@
+ sysconfdir=@sysconfdir@
+
+--- mono-2.6.4/data/mono.web.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/mono.web.pc-new.in 2010-04-27 00:40:27.000000000 +0100
+@@ -1,4 +1,4 @@
+ Name: Mono.Web
+ Description: Mono ASP.NET extension classes
+ Version: 2.0.0.0
+-Libs: -r:@prefix@/lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
++Libs: -r:@LIBDIR@/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
+
+--- mono-2.6.4/data/mono-lineeditor.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/mono-lineeditor.pc-new.in 2010-04-27 00:37:17.000000000 +0100
+@@ -1,5 +1,5 @@
+ prefix=${pcfiledir}/../..
+-assemblies_dir=${prefix}/lib/mono-source-libs
++assemblies_dir=@LIBDIR@/mono-source-libs
+ Sources=${assemblies_dir}/getline.cs
+
+ Name: Mono.Terminal.LineEditor
+--- mono-2.6.4/data/mono-nunit.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/mono-nunit.pc-new.in 2010-04-27 00:37:48.000000000 +0100
+@@ -1,6 +1,6 @@
+ prefix=${pcfiledir}/../..
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@LIBDIR@
+
+
+ Name: Mono NUnit
+--- mono-2.6.4/data/mono-options.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/mono-options.pc-new.in 2010-04-27 00:38:21.000000000 +0100
+@@ -1,5 +1,5 @@
+ prefix=${pcfiledir}/../..
+-assemblies_dir=${prefix}/lib/mono-source-libs
++assemblies_dir=@LIBDIR@/mono-source-libs
+ Sources=${assemblies_dir}/Options.cs
+
+ Name: Mono.Options
+--- mono-2.6.4/data/system.web.extensions.design_1.0.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/system.web.extensions.design_1.0.pc-new.in 2010-04-27 00:38:43.000000000 +0100
+@@ -1,4 +1,4 @@
+ Name: System.Web.Extensions.Design
+ Description: System.Web.Extensions.Design ASP.NET 2.0 add-on
+ Version: 1.0.61025.0
+-Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
++Libs: -r:@LIBDIR@/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
+--- mono-2.6.4/data/system.web.extensions_1.0.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/system.web.extensions_1.0.pc-new.in 2010-04-27 00:39:00.000000000 +0100
+@@ -1,4 +1,4 @@
+ Name: System.Web.Extensions
+ Description: System.Web.Extensions ASP.NET 2.0 add-on
+ Version: 1.0.61025.0
+-Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
++Libs: -r:@LIBDIR@/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
+--- mono-2.6.4/data/system.web.mvc.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/system.web.mvc.pc-new.in 2010-04-27 00:39:16.000000000 +0100
+@@ -1,4 +1,4 @@
+ Name: System.Web.Mvc
+ Description: System.Web.Mvc - ASP.NET MVC
+ Version: 1.0.0.0
+-Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
++Libs: -r:@LIBDIR@/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
+
+--- mono-2.8/configure.in 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/configure-new.in 2010-09-15 14:01:05.640710876 +0100
+@@ -2886,7 +2886,7 @@
+ echo "prefix=$prefix" > $mcs_topdir/build/config.make
+ echo "exec_prefix=$exec_prefix" >> $mcs_topdir/build/config.make
+ echo "sysconfdir=$sysconfdir" >> $mcs_topdir/build/config.make
+- echo 'mono_libdir=${exec_prefix}/lib' >> $mcs_topdir/build/config.make
++ echo 'mono_libdir=@LIBDIR@' >> $mcs_topdir/build/config.make
+ echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $mcs_topdir/build/config.make
+ echo 'IL_FLAGS = /debug' >> $mcs_topdir/build/config.make
+ echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $mcs_topdir/build/config.make
+@@ -2937,7 +2937,7 @@
+
+ echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
+ echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
+- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
++ echo 'mono_libdir=@LIBDIR@' >> $srcdir/$olivedir/build/config.make
+ echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
+ echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
+ echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
+--- mono-2.8/data/monodoc.pc.in 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/data/monodoc.pc-new.in 2010-09-22 12:43:38.220677135 +0100
+@@ -1,9 +1,9 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@prefix@/lib
++libdir=@LIBDIR@
+ sourcesdir=${libdir}/monodoc/sources
+
+ Name: Monodoc
+ Description: Monodoc - Mono Documentation Tools
+ Version: @VERSION@
+-Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll
++Libs: /r:${libdir}/mono/monodoc/monodoc.dll
+--- mono-2.8/data/mono-cairo.pc.in 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/data/mono-cairo.pc-new.in 2010-09-22 12:42:53.873541601 +0100
+@@ -1,9 +1,9 @@
+ prefix=${pcfiledir}/../..
+ exec_prefix=${pcfiledir}/../..
+-libdir=${prefix}/@reloc_libdir@
++libdir=@LIBDIR@
+ includedir=${prefix}/include
+
+ Name: Mono.Cairo
+ Description: Cairo bindings for Mono
+ Version: @VERSION@
+-Libs: -r:${prefix}/lib/mono/2.0/Mono.Cairo.dll
++Libs: -r:${libdir}/mono/2.0/Mono.Cairo.dll
+--- mono-2.8/data/system.web.mvc2.pc.in 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/data/system.web.mvc2.pc-new.in 2010-09-22 12:44:16.452759229 +0100
+@@ -1,4 +1,4 @@
+ Name: System.Web.Mvc2
+ Description: System.Web.Mvc - ASP.NET MVC v2
+ Version: 2.0.0.0
+-Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
++Libs: -r:@LIBDIR@/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
+--- mono-2.8/docs/Makefile.in 2010-09-10 21:58:21.000000000 +0100
++++ mono-2.8/docs/Makefile-new.in 2010-09-22 12:51:28.223926963 +0100
+@@ -252,7 +252,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-sourcesdir = $(prefix)/lib/monodoc/sources
++sourcesdir = @LIBDIR@/monodoc/sources
+ sources_DATA = \
+ mono-file-formats.source \
+ mono-tools.source \
+--- mono-2.8/docs/Makefile.am 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/docs/Makefile-new.am 2010-09-22 12:49:54.369453974 +0100
+@@ -1,4 +1,4 @@
+-sourcesdir = $(prefix)/lib/monodoc/sources
++sourcesdir = @LIBDIR@/monodoc/sources
+
+ sources_DATA = \
+ mono-file-formats.source \
+--- mono-2.8/data/mono-2.pc.in 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/data/mono-2.pc-new.in 2010-09-22 12:54:54.445011590 +0100
+@@ -1,6 +1,6 @@
+ prefix=${pcfiledir}/../..
+ exec_prefix=${pcfiledir}/../..
+-libdir=${prefix}/@reloc_libdir@
++libdir=@LIBDIR@
+ includedir=${prefix}/include/mono- at API_VER@
+ sysconfdir=@sysconfdir@
+
+--- mono-2.10/mono/metadata/assembly.c 2011-01-31 20:16:05.000000000 +0000
++++ mono-2.10/mono/metadata/assembly-new.c 2011-02-03 19:04:44.865273789 +0000
+@@ -578,7 +578,7 @@
+ }
+
+ config = g_build_filename (base, "etc", NULL);
+- lib = g_build_filename (base, "lib", NULL);
++ lib = g_build_filename (base, MONO_RELOC_LIBDIR, NULL);
+ mono = g_build_filename (lib, "mono/2.0", NULL);
+ if (stat (mono, &buf) == -1)
+ fallback ();
+@@ -2136,7 +2136,7 @@
+ if (extra_gac_paths) {
+ paths = extra_gac_paths;
+ while (!res && *paths) {
+- gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
++ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", aname->name, NULL);
+ res = probe_for_partial_name (gacpath, fullname, aname, status);
+ g_free (gacpath);
+ paths++;
+@@ -2266,7 +2266,7 @@
+ paths = extra_gac_paths;
+ while (!image && *paths) {
+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
+- "lib", "mono", "gac", subpath, NULL);
++ MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
+ image = mono_image_open (fullpath, NULL);
+ g_free (fullpath);
+ paths++;
+@@ -2572,7 +2572,7 @@
+ if (extra_gac_paths) {
+ paths = extra_gac_paths;
+ while (!result && *paths) {
+- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
++ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
+ result = mono_assembly_open_full (fullpath, status, refonly);
+ g_free (fullpath);
+ paths++;
+--- mono-2.10/data/cecil.pc.in 2011-01-31 20:16:05.000000000 +0000
++++ mono-2.10/data/cecil.pc-new.in 2011-02-03 19:10:50.904123791 +0000
+@@ -1,4 +1,4 @@
+-assemblies_dir=@prefix@/lib/mono
++assemblies_dir=@LIBDIR@/mono
+ Libraries=${assemblies_dir}/gac/Mono.Cecil/0.9.4.0__0738eb9f132ed756/Mono.Cecil.dll
+
+ Name: Mono Internal -- Do not use.
+--- mono-2.10/scripts/Makefile.am 2011-01-31 20:16:05.000000000 +0000
++++ mono-2.10/scripts/Makefile-new.am 2011-02-03 19:14:37.488167039 +0000
+@@ -171,7 +171,7 @@
+ endif
+ else
+ plat_bindir = $(bindir)
+-mono_instdir = $(prefix)/lib/mono
++mono_instdir = @LIBDIR@/mono
+ endif
+
+
+--- mono-2.10/mcs/build/config-default.make 2011-01-31 20:16:05.000000000 +0000
++++ mono-2.10/mcs/build/config-default-new.make 2011-02-03 20:01:19.554349792 +0000
+@@ -19,7 +19,7 @@
+ endif
+ prefix = /usr/local
+ exec_prefix = $(prefix)
+-mono_libdir = $(exec_prefix)/lib
++mono_libdir = @LIBDIR@
+ sysconfdir = $(prefix)/etc
+ #RUNTIME = mono
+ RUNTIME = false
diff --git a/mono-2.10-metadata-makefile.patch b/mono-2.10-metadata-makefile.patch
new file mode 100644
index 0000000..313181e
--- /dev/null
+++ b/mono-2.10-metadata-makefile.patch
@@ -0,0 +1,40 @@
+--- mono-2.10/mono/metadata/Makefile.am 2011-01-31 20:16:05.000000000 +0000
++++ mono-2.10/mono/metadata/Makefile-new.am 2011-02-03 20:09:49.629265658 +0000
+@@ -20,7 +20,7 @@
+ AM_CFLAGS = -O
+ else
+
+-assembliesdir = $(exec_prefix)/lib
++assembliesdir = @LIBDIR@
+ confdir = $(sysconfdir)
+ unix_sources = \
+ console-unix.c
+@@ -56,7 +56,7 @@
+ endif
+ noinst_LTLIBRARIES = $(shared_libraries) libmonoruntime-static.la $(sgen_libraries) $(moonlight_libraries)
+
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
+
+ #
+ # Make sure any prefix changes are updated in the binaries too.
+--- mono-2.10/mono/metadata/Makefile.in 2011-01-31 20:32:29.000000000 +0000
++++ mono-2.10/mono/metadata/Makefile-new.in 2011-02-03 20:10:45.176821202 +0000
+@@ -848,7 +848,7 @@
+ # The files that use MONO_ASSEMBLIES and/or MONO_CFG_DIR replace the
+ # / by \ if running under WIN32.
+ @CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE at assembliesdir = ${libdir}
+- at HOST_WIN32_FALSE@assembliesdir = $(exec_prefix)/lib
++ at HOST_WIN32_FALSE@assembliesdir = @LIBDIR@
+ @CROSS_COMPILING_FALSE@@HOST_WIN32_TRUE at confdir = `cygpath -m "${sysconfdir}"`
+ @CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE at confdir = ${sysconfdir}
+ @HOST_WIN32_FALSE at confdir = $(sysconfdir)
+@@ -868,7 +868,7 @@
+ @MOONLIGHT_TRUE at moonlight_libraries = libmonoruntimemoon.la
+ @SHARED_MONO_TRUE at shared_libraries = libmonoruntime.la
+ noinst_LTLIBRARIES = $(shared_libraries) libmonoruntime-static.la $(sgen_libraries) $(moonlight_libraries)
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
+ CLEANFILES = mono-bundle.stamp
+ libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD)
+ null_sources = \
diff --git a/mono-2.10-monodis.patch b/mono-2.10-monodis.patch
new file mode 100644
index 0000000..3ffa103
--- /dev/null
+++ b/mono-2.10-monodis.patch
@@ -0,0 +1,11 @@
+--- mono-2.10/mono/Makefile.am 2011-01-31 20:16:05.000000000 +0000
++++ mono-2.10/mono/Makefile-new.am 2011-02-03 20:17:08.148741427 +0000
+@@ -2,7 +2,7 @@
+ SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis
+ else
+ if MOONLIGHT
+-SUBDIRS = utils io-layer metadata arch mini
++SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis monograph tests benchmark profiler
+
+ moon-do-build:
+ @list='$(SUBDIRS)'; for subdir in $$list; do \
diff --git a/mono-2.8.1.tar.bz2 b/mono-2.10.1.tar.bz2
similarity index 71%
rename from mono-2.8.1.tar.bz2
rename to mono-2.10.1.tar.bz2
index 71176f5..9ce8f7b 100644
Binary files a/mono-2.8.1.tar.bz2 and b/mono-2.10.1.tar.bz2 differ
diff --git a/mono.spec b/mono.spec
index 75ee877..8c55ed7 100644
--- a/mono.spec
+++ b/mono.spec
@@ -1,11 +1,5 @@
-%if 1
-%define with_mono4 1
-%else
-%define with_mono4 0
-%endif
-
Name: mono
-Version: 2.8.1
+Version: 2.10.1
Release: 1%{?dist}
Summary: A .NET runtime environment
@@ -13,8 +7,8 @@ Group: Development/Languages
License: MIT
URL: http://www.mono-project.com/Main_Page
# Prereleases are available here
-#Source0: http://mono.ximian.com/monobuild/preview/sources-preview/%{name}/%{name}-%{version}.tar.bz2
-Source0: http://ftp.novell.com/pub/mono/sources/mono/mono-%{version}.tar.bz2
+Source0: http://mono.ximian.com/monobuild/preview/sources-preview/%{name}/%{name}-%{version}.tar.bz2
+#Source0: http://ftp.novell.com/pub/mono/sources/mono/mono-%{version}.tar.bz2
Source1: monodir.c
# This key was generated by Tom "spot" Callaway <tcallawa at redhat.com> on Dec 1, 2009
# by running the following command:
@@ -27,7 +21,7 @@ BuildRequires: bison
BuildRequires: glib2-devel
BuildRequires: pkgconfig
BuildRequires: libicu-devel
-BuildRequires: libgdiplus-devel >= 2.8
+BuildRequires: libgdiplus-devel >= 2.10
BuildRequires: zlib-devel
%ifarch ia64
BuildRequires: libunwind
@@ -47,22 +41,13 @@ BuildRequires: mono-core
ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390x ppc ppc64
Patch0: mono-2.8-ppc-thread.patch
-Patch1: mono-2.8-libdir.patch
+Patch1: mono-2.10-libdir.patch
Patch2: mono-1.2.3-use-monodir.patch
Patch3: mono-2.2-uselibdir.patch
Patch4: mono-2.0-monoservice.patch
-Patch5: mono-2.8-metadata-makefile.patch
+Patch5: mono-2.10-metadata-makefile.patch
Patch6: mono-281-libgdiplusconfig.patch
-Patch7: mono-2.8-monodis.patch
-Patch8: mono-281-moonlightbuild.patch
-
-%if %{with_mono4}
-Obsoletes: mono-mono-4-preview < 2.6.4
-Provides: mono-4-preview = %{version}-%{release}
-%endif
-Obsoletes: mono-jscript < 2.8
-Obsoletes: mono-data-sybase < 2.8
-Obsoletes: mono-data-firebird < 2.8
+Patch7: mono-2.10-monodis.patch
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -74,8 +59,6 @@ metadata access libraries.
Summary: The Mono CIL runtime, suitable for running .NET code
Group: Development/Languages
Requires: libgdiplus
-#Obsoletes: mono-moonlight < 2.6
-#Provides: mono-moonlight = %{version}-%{release}
%description core
This package contains the core of the Mono runtime including its
@@ -268,15 +251,15 @@ Requires: mono-core = %{version}-%{release}
%description -n monodoc-devel
Development file for monodoc
-%if %{with_mono4}
-%package -n mono-4-preview
-Summary: Provides preview code for C# 4
+%package -n mono-dotnet4
+Summary: Provides .NET 4.0
Group: Development/Languages
Requires: mono-core = %{version}-%{release}
+Obsoletes: mono-mono-4-preview < 2.6.8
+Provides: mono-dotnet4 = %{version}-%{release}
-%description -n mono-4-preview
-Preview for the new C# 4.0 code
-%endif
+%description -n mono-dotnet4
+Provides .NET 4.0 framework
%define monodir %{_libdir}/mono
%define gac_dll(dll) %{monodir}/gac/%{1} \
@@ -319,7 +302,6 @@ sed -i -e 's!%{_libdir}!@LIBDIR@!' %{PATCH5}
%patch4 -p1 -b .monoservice
%patch6 -p1 -b .libgdiplus
%patch7 -p1 -b .monodis
-%patch8 -p1 -b .fixsockets
autoreconf -f -i -s
# Add undeclared Arg
@@ -340,18 +322,17 @@ gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
%configure --with-ikvm-native=yes --with-jit=yes --with-xen_opt=yes \
--with-moonlight=no --with-profile2=yes --with-monotouch=no \
--with-libgdiplus=installed --with-sgen=no \
-%if ! %{with_mono4}
- --with-profile4=no \
-%endif
+ --with-profile4=yes
+
%ifnarch %{ix86} x86_64 %{arm}
--disable-system-aot
%endif
-make
+make
%install
%{__rm} -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install
install monodir %{buildroot}%{_bindir}
# copy the mono.snk key into /etc/pki/mono
@@ -374,14 +355,13 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{__rm} %{buildroot}%{_datadir}/libgc-mono/*.html
%{__rm} %{buildroot}%{_datadir}/libgc-mono/gc.man
%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/mscorlib.dll.so
+%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/mcs.exe.so
%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/gmcs.exe.so
%{__rm} -rf %{buildroot}%{monodir}/xbuild/Microsoft
-%if %{with_mono4}
%{__rm} -f %{buildroot}%{_libdir}/mono/4.0/mscorlib.dll.so
%{__rm} -f %{buildroot}%{_libdir}/mono/4.0/dmcs.exe.so
%{__rm} -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32
%{__rm} -rf %{buildroot}%{_bindir}/mono-configuration-crypto
-%endif
%find_lang mcs
@@ -410,6 +390,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_bindir}/lc
%{_bindir}/gacutil2
%{_bindir}/mcs
+%{monodir}/2.0/mcs.exe
%mono_bin gmcs
%{_bindir}/mozroots
%{_bindir}/pdb2mdb
@@ -417,6 +398,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_bindir}/sn
%{_bindir}/svcutil
%{_bindir}/mono-heapviz
+%{_bindir}/mprof-report
%mono_bin xbuild
%{monodir}/2.0/System.Xml.Linq.dll
%{_mandir}/man1/certmgr.1.gz
@@ -431,6 +413,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_mandir}/man1/csharp.1.gz
%{_mandir}/man1/pdb2mdb.1.gz
%{_mandir}/man1/lc.1.gz
+%{_mandir}/man1/mprof-report.1.gz
%{_libdir}/libMonoPosixHelper.so
%dir %{monodir}
%dir %{monodir}/2.0
@@ -465,6 +448,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%gac_dll System.Xml
%gac_dll Mono.Tasklets
%gac_dll WindowsBase
+%gac_dll System.Net
%{monodir}/gac/System.Xml.Linq
%{monodir}/?.0/mscorlib.dll
%{monodir}/?.0/mscorlib.dll.mdb
@@ -647,7 +631,6 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%gac_dll System.Web.DynamicData
%gac_dll System.Web.Routing
%gac_dll System.Web.Services
-%gac_dll_35 System.Web.Extensions.Design
%{_mandir}/man1/disco.1.gz
%{_mandir}/man1/mconfig.1.gz
%{_mandir}/man1/soapsuds.1.gz
@@ -706,6 +689,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%gac_dll System.Data.Linq
%gac_dll System.EnterpriseServices
%gac_dll System.Data.Services
+%gac_dll System.Data.Services.Client
%gac_dll Novell.Directory.Ldap
%gac_dll System.DirectoryServices
%gac_dll System.Transactions
@@ -732,7 +716,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_libdir}/mono/gac/monodoc
%{_libdir}/monodoc/*
%{_libdir}/mono/monodoc/monodoc.dll
-%{_bindir}/mdoc
+%mono_bin mdoc
%{_bindir}/mod
%{_bindir}/mdoc-*
%{_bindir}/mdass*
@@ -746,8 +730,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%defattr (-, root, root)
%{_libdir}/pkgconfig/monodoc.pc
-%if %{with_mono4}
-%files -n mono-4-preview
+%files -n mono-dotnet4
%defattr (-,root,root,-)
%config (noreplace) %{_sysconfdir}/mono/4.0/*.config
%config (noreplace) %{_sysconfdir}/mono/4.0/settings.map
@@ -775,11 +758,17 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%gac_dll_4 System.Web.ApplicationServices
%gac_dll_4 System.Windows.Forms.DataVisualization
%gac_dll_4 System.Xaml
+%gac_dll_4 System.Net
+%gac_dll_4 System.Data.Services.Client
+%gac_dll_4 WebMatrix.Data
%gac_dll_4 Mono.CodeContracts
+%gac_dll_4 Microsoft.Web.Infrastructure
%{monodir}/mono-configuration-crypto/4.0/mono-config*
%{monodir}/mono-configuration-crypto/4.0/Mono.Configuration.Crypto.dll*
%{_mandir}/man1/ccrewrite.1.gz
%{monodir}/4.0/xbuild.rsp
+%{monodir}/4.0/Microsoft.Web.Infrastructure.dll
+%{monodir}/4.0/Mono.Debugger.Soft.dll
%{monodir}/4.0/Accessibility.dll*
%{monodir}/4.0/Commons.Xml.Relaxng.dll
%{monodir}/4.0/CustomMarshalers.dll
@@ -868,9 +857,16 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{monodir}/4.0/dmcs.exe.config
%{monodir}/4.0/mono-shlib-cop.exe.config
%{monodir}/4.0/sqlmetal.exe.config
-%endif
%changelog
+* Mon Mar 07 2011 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.10.1-1
+- Bump to 2.10.1
+- Update libdir and metadata patches
+- Remove moonlight build patch
+- Renamed mono-4-preview to mono-dotnet4, removed as an option
+- Corrected mono-dotnet4 description
+- spec file clean up
+
* Tue Dec 07 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.8.1-1
- Bump to latest bug release version
- Fix libgdiplus config patch
More information about the scm-commits
mailing list