[mono] Bump to 2.8 release Remove .NET 1.1 code Update ppc threading patch Update patch1 and 5 and rename C
Paul F. Johnson
pfj at fedoraproject.org
Tue Oct 12 23:57:06 UTC 2010
commit c92b865df8020c52076f730317d645ed0ba613ce
Author: Paul F. Johnson <paul at all-the-johnsons.co.uk>
Date: Wed Oct 13 00:56:13 2010 +0100
Bump to 2.8 release
Remove .NET 1.1 code
Update ppc threading patch
Update patch1 and 5 and rename
Combine patches 2 and 7 (why two libdir patches?)
Remove jay from the install step
Realise that spelling is quite imporgtint...
Big changes to the spec file to bring it into line with Novell's fixes
New mvc, mvc-devel and winfx subpackages
Some parts of the mono-web subpackage moved to mvc
Fix the macro which looked for 1.0 things
Remove and obsoletes mono-jscript
Remove and obsolete data-sybase and data-firebird
Modify macros to make sense now the 1.0 stuff has gone
Extend the 4.0 subpackage to include lots of new stuff
.gitignore | 1 +
mono-2.8-libdir.patch | 246 ++++++++++
...efile.patch => mono-2.8-metadata-makefile.patch | 36 +-
...pc-threading.patch => mono-2.8-ppc-thread.patch | 10 +-
mono-264-libdir.patch | 151 ------
mono-libdir-126.patch | 62 ---
mono.spec | 495 +++++++++++---------
sources | 2 +-
8 files changed, 556 insertions(+), 447 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c1a3a1b..e7e4c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
mono-2.6.7.tar.bz2
+/mono-2.8.tar.bz2
diff --git a/mono-2.8-libdir.patch b/mono-2.8-libdir.patch
new file mode 100644
index 0000000..09c08a9
--- /dev/null
+++ b/mono-2.8-libdir.patch
@@ -0,0 +1,246 @@
+--- mono-2.8/mono/metadata/assembly.c 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/mono/metadata/assembly-new.c 2010-09-15 13:40:24.295239665 +0100
+@@ -564,7 +564,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/1.0", NULL);
+ if (stat (mono, &buf) == -1)
+ fallback ();
+@@ -2088,7 +2088,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++;
+@@ -2218,7 +2218,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++;
+@@ -2510,7 +2510,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.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,7 +808,7 @@
+ 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/mcs/build/config-default.make 2010-04-22 16:38:03.000000000 +0100
++++ mono-2.6.4/mcs/build/config-default-new.make 2010-04-27 00:29:59.000000000 +0100
+@@ -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
+--- mono-2.6.4/scripts/Makefile.am 2010-04-22 16:37:43.000000000 +0100
++++ mono-2.6.4/scripts/Makefile-new.am 2010-04-27 00:42:28.000000000 +0100
+@@ -176,7 +176,7 @@
+ endif
+ else
+ plat_bindir = $(bindir)
+-mono_instdir = $(prefix)/lib/mono
++mono_instdir = @LIBDIR@/mono
+ endif
+
+
+--- mono-2.6.4/data/cecil.pc.in 2010-04-22 16:37:47.000000000 +0100
++++ mono-2.6.4/data/cecil.pc-new.in 2010-04-27 00:33:58.000000000 +0100
+@@ -1,4 +1,4 @@
+-assemblies_dir=@prefix@/lib/mono
++assemblies_dir=@LIBDIR@/mono
+ Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
+
+ Name: Mono Internal -- Do not use.
+--- 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@
+
diff --git a/mono-2.6-metadata-makefile.patch b/mono-2.8-metadata-makefile.patch
similarity index 61%
rename from mono-2.6-metadata-makefile.patch
rename to mono-2.8-metadata-makefile.patch
index e4069a4..0e54ace 100644
--- a/mono-2.6-metadata-makefile.patch
+++ b/mono-2.8-metadata-makefile.patch
@@ -1,38 +1,38 @@
---- mono-2.6/mono/metadata/Makefile.am 2009-09-25 15:58:10.000000000 +0100
-+++ mono-2.6/mono/metadata/Makefile-new.am 2009-09-30 19:23:39.000000000 +0100
+--- mono-2.8/mono/metadata/Makefile.am 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/mono/metadata/Makefile-new.am 2010-09-15 13:47:56.378549804 +0100
@@ -20,7 +20,7 @@
AM_CFLAGS = -O
else
-assembliesdir = $(exec_prefix)/lib
-+assembliesdir = $(libdir)
++assembliesdir = @LIBDIR@
confdir = $(sysconfdir)
unix_sources = \
console-unix.c
-@@ -36,7 +36,7 @@
- #
- noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
+@@ -40,7 +40,7 @@
+
+ noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la $(sgen_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.6/mono/metadata/Makefile.in 2009-09-30 17:34:17.000000000 +0100
-+++ mono-2.6/mono/metadata/Makefile-new.in 2009-09-30 19:27:02.000000000 +0100
-@@ -372,7 +372,7 @@
+--- mono-2.8/mono/metadata/Makefile.in 2010-09-10 21:58:23.000000000 +0100
++++ mono-2.8/mono/metadata/Makefile-new.in 2010-09-15 13:51:58.500133920 +0100
+@@ -713,7 +713,7 @@
# The files that use MONO_ASSEMBLIES and/or MONO_CFG_DIR replace the
# / by \ if running under WIN32.
- @CROSS_COMPILING_TRUE@@PLATFORM_WIN32_TRUE at assembliesdir = ${libdir}
-- at PLATFORM_WIN32_FALSE@assembliesdir = $(exec_prefix)/lib
-+ at PLATFORM_WIN32_FALSE@assembliesdir = $(libdir)
- @CROSS_COMPILING_FALSE@@PLATFORM_WIN32_TRUE at confdir = `cygpath -m "${sysconfdir}"`
- @CROSS_COMPILING_TRUE@@PLATFORM_WIN32_TRUE at confdir = ${sysconfdir}
- @PLATFORM_WIN32_FALSE at confdir = $(sysconfdir)
-@@ -388,7 +388,7 @@
- # convenience lib, so we have to do it ourselves
+ @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)
+@@ -730,7 +730,7 @@
#
- noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
+ @SUPPORT_SGEN_TRUE at sgen_libraries = libmonoruntimesgen.la libmonoruntimesgen-static.la
+ noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la $(sgen_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
diff --git a/mono-2.2-ppc-threading.patch b/mono-2.8-ppc-thread.patch
similarity index 50%
rename from mono-2.2-ppc-threading.patch
rename to mono-2.8-ppc-thread.patch
index 2a442ba..8c39294 100644
--- a/mono-2.2-ppc-threading.patch
+++ b/mono-2.8-ppc-thread.patch
@@ -1,6 +1,6 @@
---- mono-2.2/mono/mini/main.c 2008-11-18 19:00:26.000000000 +0000
-+++ mono-2.2/mono/mini/main-new.c 2008-11-18 19:16:11.000000000 +0000
-@@ -26,10 +26,14 @@
+--- mono-2.8/mono/mini/main.c 2010-09-10 21:55:45.000000000 +0100
++++ mono-2.8/mono/mini/main-new.c 2010-09-15 13:26:40.582184193 +0100
+@@ -88,10 +88,14 @@
}
#else
@@ -14,5 +14,5 @@
+ sched_setaffinity(0, sizeof(mask), &mask);
+#endif
mono_build_date = build_date;
- return mono_main (argc, argv);
- }
+
+ return mono_main_with_options (argc, argv);
diff --git a/mono.spec b/mono.spec
index 4a9578f..27ff1a3 100644
--- a/mono.spec
+++ b/mono.spec
@@ -1,5 +1,3 @@
-#%%define svnver 138447
-
%ifnarch s390 s390x
%define with_mono4 1
%else
@@ -7,16 +5,16 @@
%endif
Name: mono
-Version: 2.6.7
-Release: 3%{?dist}
+Version: 2.8
+Release: 1.1%{?dist}
Summary: A .NET runtime environment
Group: Development/Languages
License: MIT
URL: http://www.mono-project.com/Main_Page
# Prereleases are available here
-# http://mono.ximian.com/monobuild/preview/sources-preview/
-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:
@@ -29,7 +27,7 @@ BuildRequires: bison
BuildRequires: glib2-devel
BuildRequires: pkgconfig
BuildRequires: libicu-devel
-BuildRequires: libgdiplus-devel >= 2.6.7
+BuildRequires: libgdiplus-devel >= 2.8
BuildRequires: zlib-devel
%ifarch ia64
BuildRequires: libunwind
@@ -48,19 +46,21 @@ BuildRequires: mono-core
# JIT only availible on these:
ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
-Patch0: mono-2.2-ppc-threading.patch
-Patch1: mono-libdir-126.patch
+Patch0: mono-2.8-ppc-thread.patch
+Patch1: mono-2.8-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.6-metadata-makefile.patch
+Patch5: mono-2.8-metadata-makefile.patch
Patch6: mono-242-libgdiplusconfig.patch
-Patch7: mono-264-libdir.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
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -81,6 +81,30 @@ Virtual Machine, Just-in-time compiler, C# compiler, security
tools and libraries (corlib, XML, System.Security, ZipLib,
I18N, Cairo and Mono.*).
+%package winfx
+Summary: Mono implementation of core WinFX APIs
+Group: Developments/Languages
+Requires: mono-core = %{version}-%{release}
+
+%description winfx
+Open source implementation of core WinFX APIs
+
+%package mvc
+Summary: Mono implementation of ASP.NET MVC
+Group: Development/Languages
+Requires: mono-core = %{version}-%{release}
+
+%description mvc
+This is the Mono implementation of ASP.NET MVC
+
+%package mvc-devel
+Summary: Development files for ASP.NET MVC
+Group: Development/Languages
+Requires: mono-core = %{version}-%{release}
+
+%description mvc-devel
+This is the Mono implementation of ASP.NET MVC
+
%package devel
Summary: Development tools for Mono
Group: Development/Languages
@@ -126,16 +150,6 @@ Requires: mono-core = %{version}-%{release}
This package contains assemblies to support I18N applications for
non-latin alphabets.
-%package jscript
-Summary: JScript .NET support for Mono
-Group: Development/Languages
-Requires: mono-core = %{version}-%{release}
-
-%description jscript
-This package contains the JScript .NET compiler and language runtime.
-This allows you to compile and run JScript.NET application and
-assemblies.
-
%package extras
Summary: Provides the infrastructure for running and building daemons and services with Mono as well as various stub assemblies
Group: Development/Languages
@@ -207,15 +221,6 @@ Requires: sqlite
This package contains the ADO.NET Data provider for the sqlite
database.
-%package data-sybase
-Summary: Sybase database connectivity for Mono
-Group: Development/Languages
-Requires: mono-core = %{version}-%{release}
-
-%description data-sybase
-This package contains the ADO.NET Data provider for the Sybase
-database.
-
%package data-oracle
Summary: Oracle database connectivity for Mono
Group: Development/Languages
@@ -234,15 +239,6 @@ Requires: mono-core = %{version}-%{release}
This package contains the ADO.NET Data provider for the PostgreSQL
database.
-%package data-firebird
-Summary: Firebird database connectivity for Mono
-Group: Development/Languages
-Requires: mono-core = %{version}-%{release}
-
-%description data-firebird
-This package contains the ADO.NET Data provider for the Firebird
-database.
-
%package -n ibm-data-db2
Summary: IBM DB2 database connectivity for Mono
Group: Development/Languages
@@ -252,15 +248,6 @@ Requires: mono-core = %{version}-%{release}
This package contains the ADO.NET Data provider for the IBM DB2
Universal database.
-%package -n bytefx-data-mysql
-Summary: MySQL database connectivity for Mono
-Group: Development/Languages
-Requires: mono-core = %{version}-%{release}
-
-%description -n bytefx-data-mysql
-This package contains the ADO.NET Data provider for MySQL. This is
-no longer maintained. MySQL AB now provides MySQL Connector/Net
-which is fully managed and actively maintained.
%package -n monodoc
Summary: The mono documentation system
@@ -291,47 +278,44 @@ Preview for the new C# 4.0 code
%define monodir %{_libdir}/mono
%define gac_dll(dll) %{monodir}/gac/%{1} \
- %{monodir}/?.0/%{1}.dll \
+ %{monodir}/2.0/%{1}.dll \
+ %{nil}
+%define gac_dll_35(dll) %{monodir}/gac/%{1} \
+ %{monodir}/3.5/%{1}.dll \
%{nil}
-%define gac_dll_2(dll) %{monodir}/gac/%{1} \
- %{monodir}/?.5/%{1}.dll \
+%define gac_dll_4(dll) %{monodir}/gac/%{1} \
+ %{monodir}/4.0/%{1}.dll \
%{nil}
%define moon_dll(dll) %{monodir}/gac/%{1} \
%{monodir}/2.1/%{1}.dll \
%{nil}
%define mono_bin(bin) %{_bindir}/%{1} \
- %{monodir}/?.0/%{1}.exe \
- %{monodir}/?.0/%{1}.exe.* \
+ %{monodir}/2.0/%{1}.exe \
+ %{monodir}/2.0/%{1}.exe.* \
%{nil}
-%define mono_bin_1(bin, dll) %{_bindir}/%{1} \
- %{monodir}/1.0/%{2}.exe \
- %{monodir}/1.0/%{2}.exe.* \
+%define mono_bin_35(bin) %{_bindir}/%{1} \
+ %{monodir}/3.5/%{1}.exe \
+ %{monodir}/3.5/%{1}.exe.* \
%{nil}
-%define mono_bin_2(bin, dll) %{_bindir}/%{1} \
- %{monodir}/2.0/%{2}.exe \
- %{monodir}/2.0/%{2}.exe.* \
- %{nil}
-%define mono_bin_4(bin, dll) %{_bindir}/%{1} \
- %{monodir}/4.0/%{2}.exe \
- %{monodir}/4.0/%{2}.exe.* \
+%define mono_bin_4(bin) %{_bindir}/%{1} \
+ %{monodir}/4.0/%{1}.exe \
+ %{monodir}/4.0/%{1}.exe.* \
%{nil}
%prep
%setup -q
%patch0 -p1 -b .ppc-threading
+sed -i -e 's!@LIBDIR@!%{_libdir}!' %{PATCH1}
+sed -i -e 's!@LIBDIR@!%{_libdir}!' %{PATCH5}
%patch1 -p1 -b .libdir
+%patch5 -p1 -b .metadata-makefile
+sed -i -e 's!%{_libdir}!@LIBDIR@!' %{PATCH1}
+sed -i -e 's!%{_libdir}!@LIBDIR@!' %{PATCH5}
%patch2 -p1 -b .usemonodir
%patch3 -p1 -b .uselibdir
%patch4 -p1 -b .monoservice
-%patch5 -p1 -b .metadata-makefile
%patch6 -p1 -b .libgdiplus
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
-%patch7 -p1 -b .libdir-22
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
-sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in}
-sed -i -e 's!${prefix}/lib/!%{_libdir}/!' data/monodoc.pc.in
-sed -i -e 's!${prefix}/lib/!%{_libdir}/!' data/mono-cairo.pc.in
autoreconf -f -i -s
@@ -359,10 +343,9 @@ gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
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
@@ -377,22 +360,22 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{__rm} %{buildroot}%{_bindir}/mono-find-requires
# This was removed upstream:
-%{__rm} -fr %{buildroot}%{monodir}/gac/Mono.Security.Win32/[124]*
-%{__rm} -rf %{buildroot}%{monodir}/1.0/Mono.Security.Win32.dll
+%{__rm} -fr %{buildroot}%{monodir}/gac/Mono.Security.Win32
%{__rm} -rf %{buildroot}%{monodir}/2.0/Mono.Security.Win32.dll
-%{__rm} -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32
+%{__rm} -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32.dll
%{__rm} %{buildroot}%{_datadir}/libgc-mono/README*
%{__rm} %{buildroot}%{_datadir}/libgc-mono/barrett_diagram
%{__rm} %{buildroot}%{_datadir}/libgc-mono/*.html
%{__rm} %{buildroot}%{_datadir}/libgc-mono/gc.man
-%{__rm} %{buildroot}/%_bindir/jay
-%{__rm} -r %{buildroot}%{_datadir}/jay
-%{__rm} %{buildroot}%{_mandir}/man1/jay.1
-%{__rm} %{buildroot}%{_mandir}/man1/monostyle.1
-%{__rm} %{buildroot}%{_mandir}/man1/oldmono.1
-%{__rm} %{buildroot}%{_mandir}/man1/mint.1
-%{__rm} %{buildroot}%{monodir}/1.0/browsercaps-updater.exe*
+%{__rm} %{buildroot}%{_libdir}/mono/2.0/mscorlib.dll.so
+%{__rm} %{buildroot}%{_libdir}/mono/2.0/gmcs.exe.so
%{__rm} -rf %{buildroot}%{monodir}/xbuild/Microsoft
+%if %{with_mono4}
+%{__rm} %{buildroot}%{_libdir}/mono/4.0/mscorlib.dll.so
+%{__rm} %{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
@@ -414,26 +397,22 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_bindir}/monodir
%{_bindir}/mono-test-install
%{_bindir}/mono-gdb.py
-%mono_bin lc
-%mono_bin certmgr
-%mono_bin chktrust
%mono_bin csharp
+%{_bindir}/csharp2
+%{_bindir}/chktrust
%mono_bin gacutil
-%{_bindir}/gacutil1
+%{_bindir}/lc
%{_bindir}/gacutil2
+%{_bindir}/mcs
%mono_bin gmcs
-%mono_bin mcs
+%{_bindir}/mozroots
+%{_bindir}/pdb2mdb
+%{_bindir}/setreg
+%{_bindir}/sn
+%{_bindir}/svcutil
+%{_bindir}/mono-heapviz
%mono_bin xbuild
-%{_bindir}/mcs1
-%mono_bin mozroots
-%mono_bin setreg
-%mono_bin sn
-%mono_bin pdb2mdb
-%mono_bin sqlmetal
-%mono_bin svcutil
%{monodir}/2.0/System.Xml.Linq.dll
-%{_libdir}/libmono.so.*
-%{_libdir}/libmono-profiler-logging.so.*
%{_mandir}/man1/certmgr.1.gz
%{_mandir}/man1/chktrust.1.gz
%{_mandir}/man1/gacutil.1.gz
@@ -448,7 +427,6 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_mandir}/man1/lc.1.gz
%{_libdir}/libMonoPosixHelper.so
%dir %{monodir}
-%dir %{monodir}/1.0
%dir %{monodir}/2.0
%dir %{monodir}/3.5
%dir %{monodir}/gac
@@ -469,7 +447,6 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%gac_dll Mono.CompilerServices.SymbolWriter
%gac_dll Mono.CSharp
%gac_dll System.Drawing
-%gac_dll Mono.GetOptions
%gac_dll Mono.Management
%gac_dll Mono.Posix
%gac_dll Mono.Security
@@ -486,66 +463,54 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{monodir}/?.0/mscorlib.dll
%{monodir}/?.0/mscorlib.dll.mdb
%dir %{_sysconfdir}/mono
-%dir %{_sysconfdir}/mono/1.0
%dir %{_sysconfdir}/mono/2.0
%dir %{_sysconfdir}/mono/mconfig
%config (noreplace) %{_sysconfdir}/mono/config
-%config (noreplace) %{_sysconfdir}/mono/1.0/machine.config
%config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
%config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
%{_libdir}/mono-source-libs/
%{monodir}/compat-2.0/System.Web.Mvc.dll
-%if %{with_mono4}
-%{_libdir}/mono/gac/Microsoft.Build.Tasks.v4.0/4.0*
-%{_libdir}/mono/gac/Microsoft.Build.Utilities.v4.0/4.0*
-%endif
+%{_libdir}/libmono*-2.0.so.*
%files devel
%defattr(-,root,root,-)
%{_sysconfdir}/pki/mono/
%{_bindir}/mono-api-*
%{monodir}/?.0/mono-api-info*
-%{_bindir}/monodis
-%{_bindir}/al1
-%mono_bin_1 al al
-%mono_bin_2 al2 al
-%mono_bin caspol
-%mono_bin cert2spc
-%mono_bin cilc
-%mono_bin dtd2xsd
-%mono_bin dtd2rng
-%mono_bin_1 genxs1 genxs
%{_bindir}/genxs
-%mono_bin sgen
+%{monodir}/2.0/culevel*
+%{monodir}/2.0/genxs*
%{monodir}/?.0/installutil.*
-%mono_bin installvst
-%mono_bin_1 ilasm ilasm
-%{_bindir}/ilasm1
-%mono_bin_2 ilasm2 ilasm
-%mono_bin macpack
-%mono_bin makecert
+%mono_bin al
+%{_bindir}/al2
+%{_bindir}/caspol
+%{_bindir}/cert2spc
+%{_bindir}/certmgr
+%{_bindir}/dtd2rng
+%{_bindir}/dtd2xsd
+%mono_bin ilasm
+%{_bindir}/installvst
+%{_bindir}/macpack
%mono_bin mkbundle
-%{_bindir}/mkbundle1
-%{_bindir}/mkbundle2
-%mono_bin mono-cil-strip
+%{_bindir}/makecert
+%{_bindir}/mono-cil-strip
%mono_bin monolinker
-%mono_bin_1 monop monop
-%{_bindir}/monop1
-%mono_bin_2 monop2 monop
-%mono_bin mono-shlib-cop
-%mono_bin mono-xmltool
+%{_bindir}/mono-shlib-cop
+%{_bindir}/mono-xmltool
+%mono_bin monop
+%{_bindir}/monop2
+%{_bindir}/permview
+%{_bindir}/peverify
+%{_bindir}/prj2make
+%mono_bin resgen
+%{_bindir}/resgen2
+%{_bindir}/secutil
+%{_bindir}/mono-sgen
+%{_bindir}/sgen
+%{_bindir}/signcode
%{_bindir}/pedump
-%mono_bin permview
-%mono_bin prj2make
-%{_bindir}/resgen1
-%mono_bin_1 resgen resgen
-%mono_bin_2 resgen2 resgen
%{_mandir}/man1/resgen.1.gz
-%mono_bin secutil
-%mono_bin signcode
%mono_bin xbuild
-%{monodir}/1.0/ictool.exe
-%{monodir}/1.0/ictool.exe.mdb
%{_mandir}/man1/al.1.gz
%{_mandir}/man1/cert2spc.1.gz
%{_mandir}/man1/cilc.1.gz
@@ -559,7 +524,6 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_mandir}/man1/monolinker.1.gz
%{_mandir}/man1/mono-shlib-cop.1.gz
%{_mandir}/man1/mono-xmltool.1.gz
-%{_mandir}/man1/monodis.1.gz
%{_mandir}/man1/monop.1.gz
%{_mandir}/man1/permview.1.gz
%{_mandir}/man1/prj2make.1.gz
@@ -567,13 +531,15 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_mandir}/man1/sgen.1.gz
%{_mandir}/man1/signcode.1.gz
%{_mandir}/man1/xbuild.1.gz
+%{_mandir}/man1/mono-api-info.1.gz
+%{_mandir}/man1/mono-configuration-crypto.1.gz
%gac_dll PEAPI
%gac_dll Microsoft.Build.Engine
%gac_dll Microsoft.Build.Framework
%gac_dll Microsoft.Build.Tasks
%gac_dll Microsoft.Build.Utilities
-%gac_dll_2 Microsoft.Build.Tasks.v3.5
-%gac_dll_2 Microsoft.Build.Utilities.v3.5
+%gac_dll_35 Microsoft.Build.Tasks.v3.5
+%gac_dll_35 Microsoft.Build.Utilities.v3.5
%{monodir}/2.0/MSBuild
%{monodir}/2.0/Microsoft.Build.xsd
%{monodir}/2.0/Microsoft.*.targets
@@ -587,12 +553,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{monodir}/3.5/Microsoft.CSharp.targets
%{monodir}/3.5/Microsoft.Common.ta*
%{monodir}/3.5/Microsoft.VisualBasic.targets
-%{_bindir}/monograph
-%{_libdir}/libmono-profiler-aot.*
-%{_libdir}/libmono-profiler-cov.*
-%{_libdir}/libmono.so
%{_libdir}/libMonoSupportW.so
-%{_libdir}/libmono-profiler-logging.so
%{_libdir}/libikvm-native.so
%{_libdir}/pkgconfig/dotnet.pc
%{_libdir}/pkgconfig/mono-cairo.pc
@@ -602,17 +563,16 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_libdir}/pkgconfig/mono-lineeditor.pc
%{_libdir}/pkgconfig/mono-options.pc
%{_libdir}/pkgconfig/wcf.pc
-%{_includedir}/mono-1.0
-%{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
-%dir %{_datadir}/mono-1.0
-%dir %{_datadir}/mono-1.0/mono
-%dir %{_datadir}/mono-1.0/mono/cil
-%{_libdir}/mono/1.0/culevel*
+%{_libdir}/pkgconfig/mono-2.pc
+%{_includedir}/mono-2.0/mono/jit/jit.h
+%{_includedir}/mono-2.0/mono/metadata/*.h
+%{_includedir}/mono-2.0/mono/utils/*.h
+%{_libdir}/libmono*-2.0.so
%files nunit
%defattr(-,root,root,-)
-%mono_bin_1 nunit-console nunit-console
-%mono_bin_2 nunit-console2 nunit-console
+%mono_bin nunit-console
+%{_bindir}/nunit-console2
%gac_dll nunit.core
%gac_dll nunit.framework
%gac_dll nunit.util
@@ -633,26 +593,19 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%gac_dll I18N.CJK
%gac_dll I18N.Other
-%files jscript
-%defattr(-,root,root,-)
-%mono_bin mjs
-%gac_dll Microsoft.JScript
-
%files extras
%defattr(-,root,root,-)
+%mono_bin mono-service
+%{_bindir}/mono-service2
%{_mandir}/man1/mono-service.1.gz
-%mono_bin_1 mono-service mono-service
-%mono_bin_2 mono-service2 mono-service
%{monodir}/gac/mono-service
%gac_dll System.Configuration.Install
%gac_dll System.Management
%gac_dll System.Messaging
%gac_dll System.ServiceProcess
-%gac_dll Microsoft.Vsa
%gac_dll Mono.Messaging.RabbitMQ
%gac_dll Mono.Messaging
%gac_dll RabbitMQ.Client
-%{_libdir}/mono/1.0/RabbitMQ.Client.Apigen*
%{_libdir}/mono/2.0/RabbitMQ.Client.Apigen*
%files wcf
@@ -665,6 +618,13 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%files web
%defattr(-,root,root,-)
+%{_bindir}/disco
+%{_bindir}/httpcfg
+%{_bindir}/mconfig
+%{_bindir}/soapsuds
+%mono_bin wsdl
+%{_bindir}/wsdl2
+%mono_bin xsd
%gac_dll Mono.Http
%gac_dll Mono.Web
%gac_dll System.ComponentModel.DataAnnotations
@@ -673,21 +633,9 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%gac_dll System.Web
%gac_dll System.Web.Abstractions
%gac_dll System.Web.DynamicData
-%gac_dll System.Web.Extensions
-%gac_dll System.Web.Extensions.Design
-%{monodir}/compat-2.0/System.Web.Extensions*dll
-%{monodir}/3.5/System.Web.Extensions*
-%gac_dll System.Web.Mvc
%gac_dll System.Web.Routing
%gac_dll System.Web.Services
-%mono_bin disco
-%mono_bin mconfig
-%mono_bin soapsuds
-%mono_bin_1 wsdl wsdl
-%{_bindir}/wsdl1
-%mono_bin_2 wsdl2 wsdl
-%mono_bin_2 xsd2 xsd
-%mono_bin_1 xsd xsd
+%gac_dll_35 System.Web.Extensions.Design
%{_mandir}/man1/disco.1.gz
%{_mandir}/man1/mconfig.1.gz
%{_mandir}/man1/soapsuds.1.gz
@@ -695,19 +643,14 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_mandir}/man1/xsd.1.gz
%config (noreplace) %{_sysconfdir}/mono/browscap.ini
%config (noreplace) %{_sysconfdir}/mono/2.0/Browsers/Compat.browser
-%config (noreplace) %{_sysconfdir}/mono/1.0/DefaultWsdlHelpGenerator.aspx
%config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx
%config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
%config (noreplace) %{_sysconfdir}/mono/2.0/web.config
-%mono_bin httpcfg
%{_mandir}/man1/httpcfg.1.gz
%files web-devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/mono.web.pc
-%{_libdir}/pkgconfig/system.web.extensions_1.0.pc
-%{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
-%{_libdir}/pkgconfig/system.web.mvc.pc
%files winforms
%defattr(-,root,root,-)
@@ -719,31 +662,47 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
# (cf. openSUSE packaging). Will be fixed post 1.2.5
%gac_dll Mono.WebBrowser
+%files mvc
+%defattr(-, root, root,-)
+%{_libdir}/mono/compat-2.0/System.Web.Extensions.Design.dll
+%{_libdir}/mono/compat-2.0/System.Web.Extensions.dll
+%{_libdir}/mono/compat-2.0/System.Web.Mvc.dll
+%gac_dll System.Web.Extensions
+%gac_dll System.Web.Extensions.Design
+%gac_dll System.Web.Mvc
+
+%files mvc-devel
+%defattr (-,root,root,-)
+%{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
+%{_libdir}/pkgconfig/system.web.extensions_1.0.pc
+%{_libdir}/pkgconfig/system.web.mvc.pc
+%{_libdir}/pkgconfig/system.web.mvc2.pc
+
+%files winfx
+%defattr(-, root, root)
+%{_libdir}/mono/2.0/WindowsBase.dll*
+%{_libdir}/mono/gac/System.Data.Services.Client/3.5*
+%{_libdir}/mono/gac/WindowsBase/*
+
%files data
%defattr(-,root,root,-)
-%mono_bin sqlsharp
+%{_bindir}/sqlsharp
+%{_bindir}/sqlmetal
%{_mandir}/man1/sqlsharp.1.gz
%gac_dll System.Data
%gac_dll System.Data.DataSetExtensions
%gac_dll System.Data.Linq
-%gac_dll Mono.Data
-%gac_dll Mono.Data.Tds
-%gac_dll Mono.Data.TdsClient
%gac_dll System.EnterpriseServices
+%gac_dll System.Data.Services
%gac_dll Novell.Directory.Ldap
%gac_dll System.DirectoryServices
%gac_dll System.Transactions
-%{_libdir}/mono/gac/System.Data.Services/2.0*
+%gac_dll Mono.Data.Tds
%files data-sqlite
%defattr(-,root,root,-)
-%gac_dll Mono.Data.SqliteClient
%gac_dll Mono.Data.Sqlite
-%files data-sybase
-%defattr(-,root,root,-)
-%gac_dll Mono.Data.SybaseClient
-
%files data-oracle
%defattr(-,root,root,-)
%gac_dll System.Data.OracleClient
@@ -752,14 +711,6 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%defattr(-,root,root,-)
%gac_dll Npgsql
-%files data-firebird
-%defattr(-,root,root,-)
-%gac_dll FirebirdSql.Data.Firebird
-
-%files -n bytefx-data-mysql
-%defattr(-,root,root,-)
-%gac_dll ByteFX.Data
-
%files -n ibm-data-db2
%defattr(-,root,root,-)
%gac_dll IBM.Data.DB2
@@ -769,11 +720,11 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%{_libdir}/mono/gac/monodoc
%{_libdir}/monodoc/*
%{_libdir}/mono/monodoc/monodoc.dll
-%mono_bin mdoc
+%{_bindir}/mdoc
+%{_bindir}/mod
%{_bindir}/mdoc-*
%{_bindir}/mdass*
%{_bindir}/mdval*
-%mono_bin mod
%{_bindir}/monodoc*
%{_mandir}/man1/md*
%{_mandir}/man1/monodoc*
@@ -785,25 +736,149 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
%if %{with_mono4}
%files -n mono-4-preview
-%defattr (-, root, root)
+%defattr (-,root,root,-)
%config (noreplace) %{_sysconfdir}/mono/4.0/*.config
%config (noreplace) %{_sysconfdir}/mono/4.0/settings.map
+%config (noreplace) %{_sysconfdir}/mono/4.0/DefaultWsdlHelpGenerator.aspx
%dir %{monodir}/4.0
%dir %{_sysconfdir}/mono/4.0
%{_bindir}/dmcs
-%{monodir}/4.0/*.exe
-%{monodir}/4.0/*.exe.*
-%{monodir}/4.0/Mono.Security.Win32.dll
-%{monodir}/4.0/System.Xml.Linq.dll
+%{_bindir}/ccrewrite
%{monodir}/4.0/MSBuild/Microsoft*
-%{monodir}/4.0/Microsoft*
-%gac_dll Microsoft.CSharp
+%{monodir}/4.0/*.exe
+%{monodir}/4.0/*.exe.mdb
+%gac_dll_4 Microsoft.CSharp
+%{_libdir}/mono/4.0/WindowsBase.dll*
%{_libdir}/mono/gac/System.Data.Services/4.0*
-%gac_dll System.Dynamic
-%{monodir}/4.0/xbuild*
+%gac_dll_4 Microsoft.Build.Tasks.v4.0
+%gac_dll_4 Microsoft.Build.Utilities.v4.0
+%gac_dll_4 System.Dynamic
+%gac_dll_4 Mono.Data.Tds
+%gac_dll_4 System.ComponentModel.Composition
+%gac_dll_4 System.Numerics
+%gac_dll_4 System.Runtime.Caching
+%gac_dll_4 System.Runtime.DurableInstancing
+%gac_dll_4 System.ServiceModel.Discovery
+%gac_dll_4 System.ServiceModel.Routing
+%gac_dll_4 System.Web.ApplicationServices
+%gac_dll_4 System.Windows.Forms.DataVisualization
+%gac_dll_4 System.Xaml
+%gac_dll_4 Mono.CodeContracts
+%{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/Accessibility.dll*
+%{monodir}/4.0/Commons.Xml.Relaxng.dll
+%{monodir}/4.0/CustomMarshalers.dll
+%{monodir}/4.0/I18N.CJK.dll
+%{monodir}/4.0/I18N.MidEast.dll
+%{monodir}/4.0/I18N.Other.dll
+%{monodir}/4.0/I18N.Rare.dll
+%{monodir}/4.0/I18N.West.dll
+%{monodir}/4.0/I18N.dll
+%{monodir}/4.0/IBM.Data.DB2.dll
+%{monodir}/4.0/ICSharpCode.SharpZipLib.dll
+%{monodir}/4.0/Microsoft.Build.Engine.dll
+%{monodir}/4.0/Microsoft.Build.Framework.dll
+%{monodir}/4.0/Microsoft.VisualC.dll
+%{monodir}/4.0/System.Xml.Linq.dll
+%{monodir}/4.0/Mono.C5.dll
+%{monodir}/4.0/Mono.CSharp.dll
+%{monodir}/4.0/Mono.Cairo.dll
+%{monodir}/4.0/Mono.CompilerServices.SymbolWriter.dll
+%{monodir}/4.0/Mono.Data.Sqlite.dll
+%{monodir}/4.0/Mono.Http.dll
+%{monodir}/4.0/Mono.Management.dll
+%{monodir}/4.0/Mono.Messaging.RabbitMQ.dll
+%{monodir}/4.0/Mono.Messaging.dll
+%{monodir}/4.0/Mono.Posix.dll
+%{monodir}/4.0/Mono.Security.dll
+%{monodir}/4.0/Mono.Simd.dll
+%{monodir}/4.0/Mono.Tasklets.dll
+%{monodir}/4.0/Mono.Web.dll
+%{monodir}/4.0/Mono.WebBrowser.dll
+%{monodir}/4.0/Novell.Directory.Ldap.dll
+%{monodir}/4.0/Npgsql.dll
+%{monodir}/4.0/OpenSystem.C.dll
+%{monodir}/4.0/PEAPI.dll
+%{monodir}/4.0/RabbitMQ.Client.dll
+%{monodir}/4.0/System.ComponentModel.DataAnnotations.dll
+%{monodir}/4.0/System.Configuration.Install.dll
+%{monodir}/4.0/System.Configuration.dll
+%{monodir}/4.0/System.Core.dll
+%{monodir}/4.0/System.Data.DataSetExtensions.dll
+%{monodir}/4.0/System.Data.Linq.dll
+%{monodir}/4.0/System.Data.OracleClient.dll
+%{monodir}/4.0/System.Data.Services.dll
+%{monodir}/4.0/System.Data.dll
+%{monodir}/4.0/System.Design.dll
+%{monodir}/4.0/System.DirectoryServices.dll
+%{monodir}/4.0/System.Drawing.Design.dll
+%{monodir}/4.0/System.Drawing.dll
+%{monodir}/4.0/System.EnterpriseServices.dll
+%{monodir}/4.0/System.IdentityModel.Selectors.dll
+%{monodir}/4.0/System.IdentityModel.dll
+%{monodir}/4.0/System.Management.dll
+%{monodir}/4.0/System.Messaging.dll
+%{monodir}/4.0/System.Runtime.Remoting.dll
+%{monodir}/4.0/System.Runtime.Serialization.Formatters.Soap.dll
+%{monodir}/4.0/System.Runtime.Serialization.dll
+%{monodir}/4.0/System.Security.dll
+%{monodir}/4.0/System.ServiceModel.Web.dll
+%{monodir}/4.0/System.ServiceModel.dll
+%{monodir}/4.0/System.ServiceProcess.dll
+%{monodir}/4.0/System.Transactions.dll
+%{monodir}/4.0/System.Web.Abstractions.dll
+%{monodir}/4.0/System.Web.DynamicData.dll
+%{monodir}/4.0/System.Web.Extensions.Design.dll
+%{monodir}/4.0/System.Web.Extensions.dll
+%{monodir}/4.0/System.Web.Routing.dll
+%{monodir}/4.0/System.Web.Services.dll
+%{monodir}/4.0/System.Web.dll
+%{monodir}/4.0/System.Windows.Forms.dll
+%{monodir}/4.0/System.Xml.dll
+%{monodir}/4.0/System.dll
+%{monodir}/4.0/cscompmgd.dll
+%{monodir}/4.0/nunit-console-runner.dll
+%{monodir}/4.0/nunit.core.dll
+%{monodir}/4.0/nunit.core.extensions.dll
+%{monodir}/4.0/nunit.core.interfaces.dll
+%{monodir}/4.0/nunit.framework.dll
+%{monodir}/4.0/nunit.framework.extensions.dll
+%{monodir}/4.0/nunit.mocks.dll
+%{monodir}/4.0/nunit.util.dll
+%{monodir}/4.0/Microsoft.Build.xsd
+%{monodir}/4.0/Microsoft.CSharp.targets
+%{monodir}/4.0/Microsoft.Common.targets
+%{monodir}/4.0/Microsoft.Common.tasks
+%{monodir}/4.0/Microsoft.VisualBasic.targets
+%{monodir}/4.0/dmcs.exe.config
+%{monodir}/4.0/mono-shlib-cop.exe.config
+%{monodir}/4.0/sqlmetal.exe.config
%endif
%changelog
+* Thu Oct 07 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.8-1.1
+- Bump to full release
+
+* Sat Oct 02 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.8-1
+- Bump to preview 8 of 2.8 release
+- Remove .NET 1.1 code
+- Update ppc threading patch
+- Update patch1 and 5 and rename
+- Combine patches 2 and 7 (why two libdir patches?)
+- Remove jay from the install step
+- Realise that spelling is quite imporgtint...
+- Big changes to the spec file to bring it into line with Novell's fixes
+- New mvc, mvc-devel and winfx subpackages
+- Some parts of the mono-web subpackage moved to mvc
+- Fix the macro which looked for 1.0 things
+- Remove and obsoletes mono-jscript
+- Remove and obsolete data-sybase and data-firebird
+- Modify macros to make sense now the 1.0 stuff has gone
+- Extend the 4.0 subpackage to include lots of new stuff
+
* Wed Jul 21 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6.7-3
- Bump to full release
- Remove patch 8 (preview-4 patch)
diff --git a/sources b/sources
index 0644d01..cdcb132 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc8b7bf061bd11fbd0fcc1c95eb79d34 mono-2.6.7.tar.bz2
+30b1180e20e5110d3fb36147137014a0 mono-2.8.tar.bz2
More information about the scm-commits
mailing list