mono to 2.8

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

g/gecko-sharp2/gecko-sharp2-vl.spec

@@ -2,7 +2,7 @@
 %define mod_name gecko-sharp-2.0
 Name: gecko-sharp2
 Version: 0.13
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 Summary: Gecko bindings for Mono
 Summary(ja): Mono 用 Gecko バインディング
 Group: Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 0.13-5
+- rebuilt with mono-2.8
+
 * Wed Oct 06 2010 Shu KONNO <owa@bg.wakwak.com> 0.13-4
 - rebuilt with rpm-4.8.1 for pkg-config
 

g/gmime22/gmime22-vl.spec

@@ -2,7 +2,7 @@ Summary:        Library for creating and parsing MIME messages
 Summary(ja):	MIMEメッセージを生成またパースするためのライブラリ
 Name:           gmime22
 Version:        2.2.26
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://spruce.sourceforge.net/gmime/
@@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 2.2.26-4
+- rebuilt with mono-2.8
+
 * Sat Sep 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.26-3
 - rebuild with rpm-4.8.1 for pkg-config file
 

g/gnome-desktop-sharp2/gnome-desktop-sharp2-vl.spec

@@ -2,7 +2,7 @@
 %define _name gnome-desktop-sharp
 Name: gnome-desktop-sharp2
 Version: 2.26.0
-Release: 7%{?_dist_release}
+Release: 8%{?_dist_release}
 Summary: Mono bindings for libgnome-desktop
 Summary(ja): Mono 用 libgnome-desktop バインディング
 Group: Development/Libraries
@@ -183,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gnome-print-sharp-2.18.pc
 
 %changelog
+* Sat Oct 09 2010 Shu KONNO <owa@bg.wakwak.com> 2.26.0-8
+- rebuilt with mono-2.8
+
 * Sun Sep 26 2010 Shu KONNO <owa@bg.wakwak.com> 2.26.0-7
 - rebuilt with rpm-4.8.1 for pkg-config
 

g/gnome-keyring-sharp/gnome-keyring-sharp-vl.spec

@@ -4,7 +4,7 @@
 
 Name:           gnome-keyring-sharp
 Version:        1.0.1
-Release:        4.%{svn_rev}svn%{?_dist_release}
+Release:        5.%{svn_rev}svn%{?_dist_release}
 Summary:        Mono implementation of GNOME Keyring
 Summary(ja):	GNOME Keyring の Mono による実装
 Group:          System Environment/Libraries
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 1.0.1-5.115768svn
+- rebuilt with mono-2.8
+
 * Sun Oct 03 2010 Shu KONNO <owa@bg.wakwak.com> 1.0.1-4.115768svn
 - rebuilt with rpm-4.8.1 for pkg-config
 

g/gnome-sharp2/gnome-sharp2-vl.spec

@@ -4,12 +4,13 @@ Summary: .Net Language Bindings for Gnome
 Summary(ja): Mono 用 GNOME バインディング
 Name: gnome-sharp2
 Version: 2.24.1
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
 License: GNU General ublic License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group: Development/Libraries
 URL: http://gtk-sharp.sf.net
 Source: %{_name}-%{version}.tar.bz2
 Patch2: gnome-sharp-find_gtkhtml_ver.patch
+Patch3: gnome-sharp-2.24.1-TestXfer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk-sharp2 gtk-sharp2-gapi
 BuildRequires: librsvg2-devel
@@ -66,8 +67,8 @@ This package contains Mono bindings for gconf and gconf peditors.
 
 %prep
 %setup -q -n %{_name}-%{version}
-#%patch2 -p1
-#autoreconf -f -i
+%patch3 -p1 -b .TestXfer
+autoreconf -f -i
 
 
 %build
@@ -137,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 09 2010 Shu KONNO <owa@bg.wakwak.com> 2.24.1-6
+- added gnome-sharp-2.24.1-TestXfer.patch
+- rebuilt with mono-2.8
+
 * Wed Sep 22 2010 IWAI, Masaharu <iwai@alib.jp> 2.24.1-5
 - build with rpm-4.8.1-1 for pkg-config file
 

g/gtk-sharp2/gtk-sharp2-vl.spec

@@ -2,7 +2,7 @@
 %define _name gtk-sharp
 Name: gtk-sharp2
 Version: 2.12.10
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 Summary: GTK+ bindings for Mono
 Summary(ja): Mono 用 GTK+ バインディング
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@ mv $RPM_BUILD_ROOT%{mono_dir}/gtk-sharp $RPM_BUILD_ROOT%{mono_dir}/gtk-sharp-2.0
 %{_prefix}/share/gapi-2.0
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 2.12.10-4
+- rebuilt with mono-2.8
+
 * Wed Sep 22 2010 IWAI, Masaharu <iwai@alib.jp> 2.12.10-3
 - build with rpm-4.8.1-1 for pkg-config file
 

g/gtksourceview-sharp2/gtksourceview-sharp2-vl.spec

@@ -3,18 +3,17 @@ Name: gtksourceview-sharp2
 Summary: GtkSourceView bindings for Mono
 Summary(ja):  Mono 用 GtkSourceView バインディング
 Version: 0.12
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GNU General Public License (GPL)
 Group: Development/Libraries/Other
 URL: http://www.go-mono.org
 Source: http://mono.ximian.com/monobuild/preview/sources/%{name}/gtksourceview-sharp-2.0-%{version}.tar.bz2
+Patch0: gtksourceview-sharp2-gnome-print.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtksourceview-devel
 BuildRequires: gnome-sharp2 gtk-sharp2-gapi
-BuildRequires: mono-devel monodoc-core
-#AutoReqprov: on
-
+BuildRequires: mono-devel monodoc
 
 %description
 This package provides Mono bindings for GtkSourceView, a child of the
@@ -23,6 +22,8 @@ features typical of a source editor.
 
 %prep
 %setup -q -n gtksourceview-sharp-2.0-%{version}
+%patch0 -p0 -b .gnome-print
+autoreconf
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -63,6 +64,11 @@ rm -Rf ${DESTDIR}
 
 
 %changelog
+* Sat Oct 09 2010 Shu KONNO <owa@bg.wakwak.com> 0.12-2
+- rebuilt with mono-2.8
+- added gtksourceview-sharp2-gnome-print.patch (from suse)
+- added BR:monodoc instead of monodoc-core
+
 * Wed Sep 17 2008 Shu KONNO <owa@bg.wakwak.com> 0.12-1vl5
 - initial build for VineSeed
     - applied vine versioning policy

lib/libg/libgdiplus/libgdiplus-vl.spec

@@ -1,8 +1,8 @@
 Name:		libgdiplus
 Summary:	An Open Source implementation of the GDI+ API.
 Summary(ja):	GDI+ API のオープンソースな実装
-Version: 	2.6.7
-Release:	2%{?_dist_release}
+Version: 	2.8
+Release:	1%{?_dist_release}
 License:	MIT
 Group:		System Environment/Libraries
 URL:		http://go-mono.com
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 2.8-1
+- updated libgdiplus to 2.8
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.7-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

m/mono-addins/mono-addins-vl.spec

@@ -4,13 +4,14 @@ Summary(ja): Mono を拡張するための汎用フレームワーク
 Name: mono-addins
 Group: Development/Tools
 Version: 0.5
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: LGPL
 BuildRoot: /var/tmp/%{name}-%{version}-root
 BuildArch: noarch
 URL: http://www.go-mono.com
 Source0: http://mono.ximian.com/monobuild/preview/sources/%{name}/%{name}-%{version}.tar.bz2
-BuildRequires: mono-devel gtk-sharp2
+BuildRequires: mono-devel
+BuildRequires: gtk-sharp2
 
 %description
 Mono.Addins is a generic framework for creating extensible applications,
@@ -73,6 +74,9 @@ rm -rf "$RPM_BUILD_ROOT"
 
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com>  0.5-3
+- rebuilt with mono-2.8 
+
 * Wed Sep 22 2010 IWAI, Masaharu <iwai@alib.jp> 0.5-2
 - build with rpm-4.8.1-1 for pkg-config file
 

m/mono-basic/mono-basic-vl.spec

@@ -1,4 +1,4 @@
-%define mono_ver 2.6.2
+%define mono_ver 2.8
 %define mono_dir %{_prefix}/lib/mono
 Summary: Visual Basic .NET support for Mono
 Summary(ja): Mono 用 Visual Basic .NET サポート
@@ -17,31 +17,12 @@ Requires: mono-data mono-locale-extras
 BuildRequires: mono-core >= %{mono_ver}
 BuildRequires: mono-winforms mono-web
 BuildRequires: mono-data mono-locale-extras
-#define __find_provides %{_bindir}/mono-find-provides
-#define __find_requires %{_bindir}/mono-find-requires
 
 %description
 This package contains the Visual Basic .NET compiler and language
 runtime. This allows you to compile and run VB.NET application and
 assemblies.
 
-%if 0
-%define gac_dll(dll)  %{mono_dir}/gac/%{1} \
-  %{mono_dir}/?.0/%{1}.dll \
-  %{nil}
-%define mono_bin(bin) %{_bindir}/%{1} \
-  %{mono_dir}/?.0/%{1}.exe \
-  %{mono_dir}/?.0/%{1}.exe.* \
-  %{nil}
-%define mono_bin_1(bin, dll) %{_bindir}/%{1} \
-  %{mono_dir}/1.0/%{2}.exe \
-  %{mono_dir}/1.0/%{2}.exe.* \
-  %{nil}
-%define mono_bin_2(bin, dll) %{_bindir}/%{1} \
-  %{mono_dir}/2.0/%{2}.exe \
-  %{mono_dir}/2.0/%{2}.exe.* \
-  %{nil}
-%endif
 
 %prep
 %setup -q
@@ -64,13 +45,26 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %doc ChangeLog README
 %{_bindir}/vbnc
 %{mono_dir}/2.0/Microsoft.VisualBasic.dll
+%{mono_dir}/2.0/Mono.Cecil.VB.Mdb.dll
+%{mono_dir}/2.0/Mono.Cecil.VB.Pdb.dll
+%{mono_dir}/2.0/Mono.Cecil.VB.dll
 %{mono_dir}/2.0/vbnc.exe
 %{mono_dir}/2.0/vbnc.exe.mdb
 %{mono_dir}/2.0/vbnc.rsp
-%{mono_dir}/gac/Microsoft.VisualBasic
-%{_mandir}/man1/*
+%dir %{mono_dir}/gac/Microsoft.VisualBasic
+%dir %{mono_dir}/gac/Mono.Cecil.VB.Mdb
+%dir %{mono_dir}/gac/Mono.Cecil.VB.Pdb
+%dir %{mono_dir}/gac/Mono.Cecil.VB
+%{mono_dir}/gac/Microsoft.VisualBasic/*
+%{mono_dir}/gac/Mono.Cecil.VB.Mdb/*
+%{mono_dir}/gac/Mono.Cecil.VB.Pdb/*
+%{mono_dir}/gac/Mono.Cecil.VB/*
+%{_mandir}/man1/vbnc.*
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 2.8-1
+- updated mono-basic to 2.8
+
 * Thu Apr 08 2010 Shu KONNO <owa@bg.wakwak.com> 2.6.2-1
 - updated mono-basic to 2.6.2
 

m/mono-debugger/mono-debugger-vl.spec

@@ -2,8 +2,8 @@
 Summary: Mono Debugger
 Summary(ja): Mono デバッガ
 Name: mono-debugger
-Version: 2.6.3
-Release: 2%{?_dist_release}
+Version: 2.8
+Release: 1%{?_dist_release}
 Group: Development/Languages
 License: MIT/X11 (include GPL files)
 URL: http://www.mono-project.com/Debugger
@@ -11,7 +11,7 @@ Source0: %{name}-%{version}.tar.bz2
 BuildRequires: mono-devel mono-nunit mono-web
 BuildRequires: pkgconfig
 BuildRequires: ncurses-devel
-Requires: mono-core >= 2.4
+Requires: mono-core >= %{version}
 Provides: mono-debugger = %{version}-%{release}
 ExclusiveArch: %ix86 x86_64
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -72,6 +72,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Oct 08 2010 2010 <owa@bg.wakwak.com> 2.8-1
+- updated mono-debugger to 2.8
+
 * Wed Sep 22 2010 IWAI, Masaharu <iwai@alib.jp> 2.6.3-2
 - build with rpm-4.8.1-1 for pkg-config file
 

m/mono-tools/mono-tools-vl.spec

@@ -1,8 +1,8 @@
 %define mono_dir %(/usr/bin/monodir)
 %define _libdir %{_prefix}/lib
 Name: mono-tools
-Version: 2.6.2
-Release: 2%{?_dist_release}
+Version: 2.8
+Release: 1%{?_dist_release}
 Summary: Collection of Tools and Utilities for Mono
 Summary(ja): Mono 用 ツールコレクション
 Group: Development/Tools
@@ -11,9 +11,11 @@ URL: http://go-mono.org/
 Source: http://mono.ximian.com/monobuild/preview/sources/%{name}/%{name}-%{version}.tar.bz2
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: mono-devel mono-nunit monodoc mono-jscript mono-data-oracle
-BuildRequires: gconf-sharp2 gecko-sharp2
-BuildRequires: gtkhtml314-sharp
+BuildRequires: mono-devel mono-nunit monodoc mono-data-oracle
+BuildRequires: gtk-sharp2
+#BuildRequires: gconf-sharp2
+#BuildRequires: gecko-sharp2
+#BuildRequires: gtkhtml314-sharp
 
 %description
 Mono Tools is a collection of development and testing programs and
@@ -62,12 +64,12 @@ monodoc --make-index
 %defattr(-, root, root)
 %{_bindir}/create-native-map
 %{_bindir}/emveepee
-%{_bindir}/gasnview
+##{_bindir}/gasnview
 %{_bindir}/gendarme
 %{_bindir}/gendarme-wizard
 %{_bindir}/gsharp
 %{_bindir}/gui-compare
-%{_bindir}/ilcontrast
+##{_bindir}/ilcontrast
 %{_bindir}/minvoke
 %{_bindir}/monodoc
 %{_bindir}/mperfmon
@@ -93,17 +95,18 @@ monodoc --make-index
 %{_libdir}/mono-tools/emveepee.exe
 %{_libdir}/mono-tools/emveepee.exe.mdb
 
-%{mono_dir}/1.0/gasnview.exe
+##{mono_dir}/1.0/gasnview.exe
 %{_datadir}/applications/gendarme-wizard.desktop
 %{_datadir}/applications/gsharp.desktop
-%{_datadir}/applications/ilcontrast.desktop
+##{_datadir}/applications/ilcontrast.desktop
 %{_datadir}/applications/monodoc.desktop
 %{_datadir}/create-native-map
 %{_datadir}/pixmaps/monodoc.png
 %{_datadir}/pkgconfig/create-native-map.pc
 %{_datadir}/pkgconfig/gendarme-framework.pc
-%{_datadir}/pixmaps/ilcontrast.png
+##{_datadir}/pixmaps/ilcontrast.png
 %{_datadir}/pixmaps/gendarme.svg
+%{_iconsdir}/hicolor/*/apps/monodoc.png
 
 %{_mandir}/man1/mperfmon*
 %{_mandir}/man1/mprof-decoder*
@@ -114,6 +117,14 @@ monodoc --make-index
 
 
 %changelog
+* Fri Oct 08 2010 2010 Shu KONNO <owa@bg.wakwak.com> 2.8-1
+- updated mono-tools to 2.8
+- added BR: gtk-sharp2
+- dropt BR: mono-jscript
+- dropt BR: gconf-sharp2
+- dropt BR: gecko-sharp2
+- dropt BR: gtkhtml314-sharp
+
 * Wed Oct 06 2010 Shu KONNO <owa@bg.wakwak.com> 2.6.2-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

m/mono/mono-vl.spec

@@ -1,14 +1,13 @@
 Summary: .NET runtime environment
 Summary(ja): .NET ランタイム環境
 Name: mono
-Version: 2.6.7
-Release: 2%{?_dist_release}
+Version: 2.8
+Release: 1%{?_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
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bison
 BuildRequires: glib2-devel
@@ -18,6 +17,10 @@ BuildRequires: libgdiplus-devel >= 2.0
 BuildRequires: zlib-devel
 # JIT only availible on these:
 ExclusiveArch: %{ix86} x86_64 ppc ia64 s390 s390x armv4l sparc
+Obsoletes: %{name}-jscript < 2.8
+Obsoletes: %{name}-data-sybase < 2.8
+Obsoletes: %{name}-data-firebird < 2.8
+Obsoletes: bytefx-data-mysql < 2.8
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -79,19 +82,6 @@ Requires:       mono-core = %{version}-%{release}
 This package contains assemblies to support I18N applications for
 non-latin alphabets.
 
-# The above seems safe
-
-%package jscript
-Summary:        JScript .NET support for Mono
-Summary(ja):    Mono 用 JScript .NET サポート
-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
@@ -145,15 +135,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
@@ -172,15 +153,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
@@ -190,16 +162,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
 Group:		Development/Tools
@@ -210,10 +172,13 @@ Obsoletes:      monodoc-core <= 2.0-1vl5
 %description -n monodoc
 monodoc is the documentation package for the mono .NET environment
 
-
 ## macros
 %define mono_dir %{_prefix}/lib/mono
 %define mono_doc %{_prefix}/lib/monodoc
+%define bin_and_exe(bin, exe) %{_bindir}/%{1} \
+	%{mono_dir}/%{2}.exe \
+	%{mono_dir}/%{2}.exe.* \
+	%{nil}
 %define gac_and_1dll(dll)  %{mono_dir}/gac/%{1} \
 	%{mono_dir}/%{2}/%{1}.dll \
 	%{nil}
@@ -221,14 +186,10 @@ monodoc is the documentation package for the mono .NET environment
 	%{mono_dir}/%{2}/%{1}.dll \
 	%{mono_dir}/%{3}/%{1}.dll \
 	%{nil}
-%define bin_and_exe(bin, exe) %{_bindir}/%{1} \
-	%{mono_dir}/%{2}.exe \
-	%{mono_dir}/%{2}.exe.mdb \
-	%{nil}
-%define bin_exe_and_conf(bin, exe) %{_bindir}/%{1} \
-	%{mono_dir}/%{2}.exe \
-	%{mono_dir}/%{2}.exe.mdb \
-	%{mono_dir}/%{2}.exe.config \
+%define gac_and_3dll(dll)  %{mono_dir}/gac/%{1} \
+	%{mono_dir}/%{2}/%{1}.dll \
+	%{mono_dir}/%{3}/%{1}.dll \
+	%{mono_dir}/%{4}/%{1}.dll \
 	%{nil}
 
 
@@ -251,8 +212,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 	--with-jit=yes \
 	--with-ikvm=yes \
 	--with-sigaltstack=no \
-	--with-moonlight=yes \
-	--with-libgdiplus=installed
+	;
 
 # don't use parallel builds
 # make %{?_smp_mflags}
@@ -265,28 +225,20 @@ make install DESTDIR=%{buildroot}
 
 install monodir %{buildroot}%{_bindir}
 
-%{__rm} %{buildroot}%{_libdir}/*.la
-%{__rm} %{buildroot}%{_libdir}/*.a
-
 ## Remove unused files
-%{__rm} %{buildroot}%{_bindir}/mono-find-provides
-%{__rm} %{buildroot}%{_bindir}/mono-find-requires
+%{__rm} -f %{buildroot}%{_libdir}/*.la
+%{__rm} -f %{buildroot}%{_libdir}/*.a
+%{__rm} -f %{buildroot}%{_bindir}/mono-find-provides
+%{__rm} -f %{buildroot}%{_bindir}/mono-find-requires
 
-# This was removed upstream:
-%{__rm} -fr %{buildroot}%{mono_dir}/gac/Mono.Security.Win32/[12]*
-%{__rm} -rf %{buildroot}%{mono_dir}/1.0/Mono.Security.Win32.dll
+## 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} %{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}%{mono_dir}/1.0/browsercaps-updater.exe*
+%{__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.*
 
 %find_lang mcs
 
@@ -299,94 +251,126 @@ install monodir %{buildroot}%{_bindir}
 %post devel -p /sbin/ldconfig
 %postun devel -p /sbin/ldconfig
 
+
 %files core -f mcs.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
-%dir %{mono_dir}
-%dir %{mono_dir}/1.0
-%dir %{mono_dir}/2.0
-%dir %{mono_dir}/3.5
-%dir %{mono_dir}/gac
-%dir %{mono_dir}/compat-*
-%bin_and_exe csharp 2.0/csharp
-%bin_and_exe certmgr 1.0/certmgr
-%bin_and_exe chktrust 1.0/chktrust
-%bin_and_exe lc 2.0/lc
-%{_bindir}/gacutil
-%bin_and_exe gacutil1 1.0/gacutil
-%bin_and_exe gacutil2 2.0/gacutil
-%bin_exe_and_conf gmcs 2.0/gmcs
-%bin_and_exe installvst 1.0/installvst
-%bin_and_exe mconfig 2.0/mconfig
-%bin_and_exe mod 1.0/mod
+%{_bindir}/mcs
 %{_bindir}/mono
 %{_bindir}/monodir
 %{_bindir}/mono-api-*
-%bin_and_exe mono-cil-strip 1.0/mono-cil-strip
+%{_bindir}/mono-configuration-crypto
+%{_bindir}/mono-heapviz
+%{_bindir}/mono-sgen
+%{_bindir}/peverify
 %{_bindir}/mono-test-install
-%bin_and_exe monolinker 2.0/monolinker
-%bin_and_exe mozroots 1.0/mozroots
-%{_bindir}/mcs
-%bin_exe_and_conf mcs1 1.0/mcs
-%bin_and_exe setreg 1.0/setreg
-%bin_and_exe sn 1.0/sn
-%bin_exe_and_conf sqlmetal 2.0/sqlmetal
-%bin_and_exe svcutil 2.0/svcutil
 %{_libdir}/libMonoPosixHelper.so
-%{_libdir}/libmono.so.*
+%{_libdir}/libmono-2.0.so.*
+%{_libdir}/libmonosgen-2.0.so.*
+%{_libdir}/libmono-profiler-aot.so.*
+%{_libdir}/libmono-profiler-cov.so.*
+%{_libdir}/libmono-profiler-iomap.so.*
 %{_libdir}/libmono-profiler-logging.so.*
-%{mono_dir}/1.0/ictool.exe
-%{mono_dir}/1.0/ictool.exe.mdb
-%{mono_dir}/?.0/installutil.*
-%{mono_dir}/?.0/mono-api-info*
-%{mono_dir}/?.0/mscorlib.dll
-%{mono_dir}/?.0/mscorlib.dll.mdb
-%{mono_dir}/3.5/System.Web.Extensions*
+%dir %{mono_dir}
+%dir %{mono_dir}/4.0
+%dir %{mono_dir}/3.5
+%dir %{mono_dir}/2.0
+%dir %{mono_dir}/gac
+%dir %{mono_dir}/compat-4.0
+%dir %{mono_dir}/compat-2.0
+%bin_and_exe ccrewrite 4.0/ccrewrite
+%bin_and_exe csharp 4.0/csharp
+%bin_and_exe csharp2 2.0/csharp
+%bin_and_exe certmgr 4.0/certmgr
+%bin_and_exe chktrust 4.0/chktrust
+%bin_and_exe dmcs 4.0/dmcs
+%bin_and_exe lc 4.0/lc
+%bin_and_exe gacutil 4.0/gacutil
+%bin_and_exe gacutil2 2.0/gacutil
+%bin_and_exe gmcs 2.0/gmcs
+%bin_and_exe installvst 4.0/installvst
+%bin_and_exe mconfig 4.0/mconfig
+%bin_and_exe mod 4.0/mod
+%bin_and_exe mono-cil-strip 4.0/mono-cil-strip
+%bin_and_exe monolinker 2.0/monolinker
+%bin_and_exe mozroots 4.0/mozroots
+%bin_and_exe setreg 4.0/setreg
+%bin_and_exe sn 4.0/sn
+%bin_and_exe sqlmetal 4.0/sqlmetal
+%bin_and_exe svcutil 4.0/svcutil
+%{mono_dir}/4.0/browsercaps-updater.exe*
+%{mono_dir}/4.0/monolinker.exe*
+%{mono_dir}/4.0/ictool.exe*
+%{mono_dir}/4.0/installutil.exe*
+%{mono_dir}/4.0/mono-api-info.exe
+%{mono_dir}/4.0/mscorlib.dll*
+%{mono_dir}/2.0/mscorlib.dll*
 %{mono_dir}/3.5/Microsoft.Build.*
+%{mono_dir}/4.0/Microsoft.CSharp.targets
+%{mono_dir}/3.5/Microsoft.CSharp.targets
+%{mono_dir}/2.0/Microsoft.CSharp.targets
+%{mono_dir}/4.0/Microsoft.Common.targets
+%{mono_dir}/3.5/Microsoft.Common.targets
+%{mono_dir}/2.0/Microsoft.Common.targets
+%{mono_dir}/4.0/Microsoft.VisualBasic.targets
+%{mono_dir}/3.5/Microsoft.VisualBasic.targets
+%{mono_dir}/2.0/Microsoft.VisualBasic.targets
 %{mono_dir}/compat-*/ICSharpCode.SharpZipLib.dll
 %{mono_dir}/gac/Mono.Cecil
 %{mono_dir}/gac/Mono.Cecil.Mdb
-%{mono_dir}/xbuild/*
-%gac_and_2dll cscompmgd 2.0 1.0
-%gac_and_2dll Commons.Xml.Relaxng 2.0 1.0
-%gac_and_2dll CustomMarshalers 2.0 1.0
-%gac_and_2dll I18N 2.0 1.0
-%gac_and_2dll I18N.West 2.0 1.0
-%gac_and_2dll ICSharpCode.SharpZipLib 2.0 1.0
-%gac_and_1dll Mono.C5 2.0
-%gac_and_2dll Mono.Cairo 2.0 1.0
-%gac_and_2dll Mono.CompilerServices.SymbolWriter 2.0 1.0
-%gac_and_2dll Mono.GetOptions 2.0 1.0
-%gac_and_2dll Mono.Posix 2.0 1.0
-%gac_and_2dll Mono.Security 2.0 1.0
-%gac_and_2dll System 2.0 1.0
-%gac_and_1dll System.Configuration 2.0
-%gac_and_2dll System.Drawing 2.0 1.0
-%gac_and_2dll System.Security 2.0 1.0
-%gac_and_2dll System.Xml 2.0 1.0
-%gac_and_1dll System.Xml.Linq 2.0
-%gac_and_1dll System.Core 2.0
-%gac_and_1dll Mono.CSharp 2.0
+%{mono_dir}/mono-configuration-crypto/4.0/Mono.Configuration.Crypto.dll*
+%{mono_dir}/mono-configuration-crypto/4.0/mono-configuration-crypto.exe*
+%gac_and_2dll cscompmgd 4.0 2.0
+%gac_and_2dll Commons.Xml.Relaxng 4.0 2.0
+%gac_and_2dll CustomMarshalers 4.0 2.0
+%gac_and_2dll I18N 4.0 2.0
+%gac_and_2dll I18N.West 4.0 2.0
+%gac_and_2dll ICSharpCode.SharpZipLib 4.0 2.0
+%gac_and_1dll Microsoft.CSharp 4.0
+%gac_and_2dll Mono.C5 4.0 2.0
+%gac_and_2dll Mono.Cairo 4.0 2.0
+%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_2dll Mono.CSharp 4.0 2.0
+%gac_and_1dll Mono.CodeContracts 4.0
 %gac_and_1dll Mono.Debugger.Soft 2.0
-%gac_and_1dll Mono.Management 2.0
-%gac_and_1dll Mono.Simd 2.0
-%gac_and_1dll Mono.Tasklets 2.0
-%gac_and_1dll System.ComponentModel.DataAnnotations 2.0
-%gac_and_1dll System.IdentityModel.Selectors 2.0
-%gac_and_1dll System.IdentityModel 2.0
-%gac_and_1dll System.Runtime.Serialization 2.0
-%gac_and_2dll OpenSystem.C 2.0 1.0
-%gac_and_1dll WindowsBase 2.0
+%gac_and_2dll Mono.Management 4.0 2.0
+%gac_and_2dll Mono.Simd 4.0 2.0
+%gac_and_2dll Mono.Tasklets 4.0 2.0
+%gac_and_2dll System 4.0 2.0
+%gac_and_2dll System.Configuration 4.0 2.0
+%gac_and_1dll System.Dynamic 4.0
+%gac_and_2dll System.Drawing 4.0 2.0
+%gac_and_2dll System.Core 4.0 2.0
+%gac_and_1dll System.ComponentModel.Composition 4.0
+%gac_and_2dll System.ComponentModel.DataAnnotations 4.0 2.0
+%gac_and_2dll System.IdentityModel 4.0 2.0
+%gac_and_2dll System.IdentityModel.Selectors 4.0 2.0
+%gac_and_1dll System.Numerics 4.0
+%gac_and_1dll System.Runtime.Caching 4.0
+%gac_and_1dll System.Runtime.DurableInstancing 4.0
+%gac_and_2dll System.Runtime.Serialization 4.0 2.0
+%gac_and_2dll System.Runtime.Serialization.Formatters.Soap 4.0 2.0
+%gac_and_2dll System.Security 4.0 2.0
+%gac_and_1dll System.Xaml 4.0
+%gac_and_2dll System.Xml 4.0 2.0
+%gac_and_2dll System.Xml.Linq 4.0 2.0
+%gac_and_2dll OpenSystem.C 4.0 2.0
+%gac_and_2dll WindowsBase 4.0 2.0
 %dir %{_sysconfdir}/mono
-%dir %{_sysconfdir}/mono/1.0
+%dir %{_sysconfdir}/mono/4.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/4.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
 %config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
+%config (noreplace) %{_sysconfdir}/mono/4.0/settings.map
 %{_prefix}/lib/mono-source-libs/
+%{_mandir}/man1/ccrewrite.1.gz
 %{_mandir}/man1/certmgr.1.gz
 %{_mandir}/man1/chktrust.1.gz
 %{_mandir}/man1/csharp.1.gz
@@ -400,90 +384,95 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/setreg.1.gz
 %{_mandir}/man1/sn.1.gz
 %{_mandir}/man1/resgen.1.gz
+%{_mandir}/man1/mono-api-info.1.gz
 %{_mandir}/man1/mono-cil-strip.1.gz
-%{_mandir}/man1/xbuild.1.gz
+%{_mandir}/man1/mono-configuration-crypto.1.gz
 %{_mandir}/man5/mono-config.5.gz
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/al
 %{_bindir}/genxs
-%{_bindir}/ilasm1
 %{_bindir}/mkbundle
-%bin_and_exe mkbundle1 1.0/mkbundle
-%bin_and_exe mkbundle2 2.0/mkbundle
+%{_bindir}/mono-gdb.py
 %{_bindir}/monodis
 %{_bindir}/monograph
-%{_bindir}/monop1
-%{_bindir}/mono-gdb.py
 %{_bindir}/pedump
-%{_bindir}/resgen1
-%bin_and_exe al1 1.0/al
+##{_bindir}/prj2make
+%{_bindir}/xbuild
+%{_libdir}/libmono-2.0.so
+%{_libdir}/libmono-profiler-aot.so
+%{_libdir}/libmono-profiler-cov.so
+%{_libdir}/libmono-profiler-iomap.so
+%{_libdir}/libmono-profiler-logging.so
+%{_libdir}/libmonosgen-2.0.so
+%{_libdir}/libMonoSupportW.so
+%{_libdir}/libikvm-native.so
+%{mono_dir}/4.0/mkbundle.exe*
+%{mono_dir}/2.0/mkbundle.exe*
+%{mono_dir}/4.0/genxs.exe*
+%{mono_dir}/2.0/genxs.exe*
+%{mono_dir}/2.0/ilasm.exe*
+%bin_and_exe al 4.0/al
 %bin_and_exe al2 2.0/al
-%bin_and_exe caspol 1.0/caspol
-%bin_and_exe cert2spc 1.0/cert2spc
-%bin_and_exe cilc 1.0/cilc
-%bin_and_exe dtd2xsd 1.0/dtd2xsd
-%bin_and_exe dtd2rng 1.0/dtd2rng
-%bin_and_exe genxs1 1.0/genxs
-%bin_and_exe sgen 2.0/sgen
-%bin_and_exe ilasm 1.0/ilasm
-%bin_and_exe ilasm2 2.0/ilasm
-%bin_and_exe macpack 1.0/macpack
-%bin_and_exe makecert 1.0/makecert
-%bin_and_exe monop 1.0/monop
+%bin_and_exe caspol 4.0/caspol
+%bin_and_exe cert2spc 4.0/cert2spc
+%bin_and_exe dtd2xsd 4.0/dtd2xsd
+%bin_and_exe dtd2rng 4.0/dtd2rng
+%bin_and_exe sgen 4.0/sgen
+%bin_and_exe ilasm 4.0/ilasm
+%bin_and_exe macpack 4.0/macpack
+%bin_and_exe makecert 4.0/makecert
+%bin_and_exe monop 4.0/monop
 %bin_and_exe monop2 2.0/monop
-%bin_exe_and_conf mono-shlib-cop 2.0/mono-shlib-cop
-%bin_and_exe mono-xmltool 2.0/mono-xmltool
-%bin_and_exe pdb2mdb 2.0/pdb2mdb
-%bin_and_exe permview 1.0/permview
-%bin_and_exe prj2make 1.0/prj2make
-%bin_and_exe resgen 1.0/resgen
+%bin_and_exe mono-shlib-cop 4.0/mono-shlib-cop
+%bin_and_exe mono-xmltool 4.0/mono-xmltool
+%bin_and_exe pdb2mdb 4.0/pdb2mdb
+%bin_and_exe permview 4.0/permview
+%bin_and_exe resgen 4.0/resgen
 %bin_and_exe resgen2 2.0/resgen
-%bin_and_exe secutil 1.0/secutil
-%bin_and_exe signcode 1.0/signcode
-%bin_and_exe xbuild 2.0/xbuild
-%bin_and_exe xbuild 3.5/xbuild
-%{mono_dir}/1.0/culevel*
-%{mono_dir}/2.0/MSBuild
+%bin_and_exe secutil 4.0/secutil
+%bin_and_exe signcode 4.0/signcode
+%{mono_dir}/xbuild
+%{mono_dir}/4.0/xbuild.*
+%{mono_dir}/3.5/xbuild.*
+%{mono_dir}/2.0/xbuild.*
+%{mono_dir}/4.0/culevel.exe*
+%{mono_dir}/2.0/culevel.exe*
+%{mono_dir}/4.0/MSBuild/*.xsd
+%{mono_dir}/3.5/MSBuild/*.xsd
+%{mono_dir}/2.0/MSBuild/*.xsd
+%{mono_dir}/4.0/Microsoft.Build.xsd
+%{mono_dir}/3.5/Microsoft.Build.xsd
 %{mono_dir}/2.0/Microsoft.Build.xsd
-%{mono_dir}/2.0/Microsoft.*.targets
-%{mono_dir}/2.0/Microsoft.Common.tasks
-%{mono_dir}/2.0/xbuild.rsp
-%{mono_dir}/3.5/MSBuild
+%{mono_dir}/4.0/Microsoft.*.targets
 %{mono_dir}/3.5/Microsoft.*.targets
+%{mono_dir}/2.0/Microsoft.*.targets
+%{mono_dir}/4.0/Microsoft.Common.tasks
 %{mono_dir}/3.5/Microsoft.Common.tasks
-%{mono_dir}/3.5/xbuild.rsp
-%gac_and_2dll PEAPI 2.0 1.0
-%gac_and_2dll Microsoft.Build.Engine 3.5 2.0
-%gac_and_2dll Microsoft.Build.Framework 3.5 2.0
+%{mono_dir}/2.0/Microsoft.Common.tasks
+%gac_and_2dll PEAPI 4.0 2.0
+%gac_and_3dll Microsoft.Build.Engine 4.0 3.5 2.0
+%gac_and_3dll Microsoft.Build.Framework 4.0 3.5 2.0
 %gac_and_1dll Microsoft.Build.Tasks 2.0
+%gac_and_1dll Microsoft.Build.Tasks.v4.0 4.0
 %gac_and_1dll Microsoft.Build.Tasks.v3.5 3.5
 %gac_and_1dll Microsoft.Build.Utilities 2.0
+%gac_and_1dll Microsoft.Build.Utilities.v4.0 4.0
 %gac_and_1dll Microsoft.Build.Utilities.v3.5 3.5
-%gac_and_2dll Microsoft.VisualC 2.0 1.0
-%{_libdir}/libmono-profiler-aot.*
-%{_libdir}/libmono-profiler-cov.*
-%{_libdir}/libmono.so
-%{_libdir}/libMonoSupportW.so
-%{_libdir}/libmono-profiler-logging.so
-%{_libdir}/libikvm-native.so
+%gac_and_2dll Microsoft.VisualC 4.0 2.0
 %{_libdir}/pkgconfig/dotnet.pc
 %{_libdir}/pkgconfig/mono-cairo.pc
 %{_libdir}/pkgconfig/mono.pc
+%{_libdir}/pkgconfig/mono-2.pc
 %{_libdir}/pkgconfig/cecil.pc
 %{_libdir}/pkgconfig/dotnet35.pc
 %{_libdir}/pkgconfig/mono-lineeditor.pc
 %{_libdir}/pkgconfig/mono-options.pc
 %{_libdir}/pkgconfig/wcf.pc
-%{_includedir}/mono-1.0
-%dir %{_datadir}/mono-1.0
-%dir %{_datadir}/mono-1.0/mono
-%dir %{_datadir}/mono-1.0/mono/cil
-%{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
+%{_includedir}/mono-2.0
 %{_mandir}/man1/al.1.gz
 %{_mandir}/man1/cert2spc.1.gz
-%{_mandir}/man1/cilc.1.gz
+##{_mandir}/man1/cilc.1.gz
 %{_mandir}/man1/dtd2xsd.1.gz
 %{_mandir}/man1/genxs.1.gz
 %{_mandir}/man1/ilasm.1.gz
@@ -496,153 +485,137 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/monop.1.gz
 %{_mandir}/man1/pdb2mdb.1.gz
 %{_mandir}/man1/permview.1.gz
-%{_mandir}/man1/prj2make.1.gz
+##{_mandir}/man1/prj2make.1.gz
 %{_mandir}/man1/secutil.1.gz
 %{_mandir}/man1/sgen.1.gz
 %{_mandir}/man1/signcode.1.gz
+%{_mandir}/man1/xbuild.1.gz
 
 %files nunit
 %defattr(-,root,root,-)
-%bin_exe_and_conf nunit-console 1.0/nunit-console
-%bin_exe_and_conf nunit-console2 2.0/nunit-console
-%gac_and_2dll nunit.core 2.0 1.0
-%gac_and_2dll nunit.framework 2.0 1.0
-%gac_and_2dll nunit.util 2.0 1.0
-%gac_and_2dll nunit.mocks 2.0 1.0
-%gac_and_2dll nunit-console-runner 2.0 1.0
-%gac_and_2dll nunit.core.extensions 2.0 1.0
-%gac_and_2dll nunit.core.interfaces 2.0 1.0
-%gac_and_2dll nunit.framework.extensions 2.0 1.0
+%bin_and_exe nunit-console 4.0/nunit-console
+%bin_and_exe nunit-console2 2.0/nunit-console
+%gac_and_2dll nunit.core 4.0 2.0
+%gac_and_2dll nunit.framework 4.0 2.0
+%gac_and_2dll nunit.util 4.0 2.0
+%gac_and_2dll nunit.mocks 4.0 2.0
+%gac_and_2dll nunit-console-runner 4.0 2.0
+%gac_and_2dll nunit.core.extensions 4.0 2.0
+%gac_and_2dll nunit.core.interfaces 4.0 2.0
+%gac_and_2dll nunit.framework.extensions 4.0 2.0
 %{_libdir}/pkgconfig/mono-nunit.pc
 
 %files locale-extras
 %defattr(-,root,root,-)
-%gac_and_2dll I18N.MidEast 2.0 1.0
-%gac_and_2dll I18N.Rare 2.0 1.0
-%gac_and_2dll I18N.CJK 2.0 1.0
-%gac_and_2dll I18N.Other 2.0 1.0
-
-%files jscript
-%defattr(-,root,root,-)
-%bin_and_exe mjs 1.0/mjs
-%gac_and_2dll Microsoft.JScript 2.0 1.0
+%gac_and_2dll I18N.MidEast 4.0 2.0
+%gac_and_2dll I18N.Rare 4.0 2.0
+%gac_and_2dll I18N.CJK 4.0 2.0
+%gac_and_2dll I18N.Other 4.0 2.0
 
 %files extras
 %defattr(-,root,root,-)
 %{_mandir}/man1/mono-service.1.gz
-%bin_and_exe mono-service 1.0/mono-service
+%bin_and_exe mono-service 4.0/mono-service
 %bin_and_exe mono-service2 2.0/mono-service
 %{mono_dir}/gac/mono-service
-%gac_and_2dll System.Management 2.0 1.0
-%gac_and_2dll System.Messaging 2.0 1.0
-%gac_and_2dll System.ServiceProcess 2.0 1.0
-%gac_and_1dll System.ServiceModel 2.0
-%gac_and_2dll System.Configuration.Install 2.0 1.0
-%gac_and_2dll Microsoft.Vsa 2.0 1.0
-%gac_and_2dll Mono.Messaging.RabbitMQ 2.0 1.0
-%gac_and_2dll Mono.Messaging 2.0 1.0
-%gac_and_2dll RabbitMQ.Client 2.0 1.0
-%{mono_dir}/1.0/RabbitMQ.Client.Apigen.exe*
+%gac_and_2dll System.Configuration.Install 4.0 2.0
+%gac_and_2dll System.Management 4.0 2.0
+%gac_and_2dll System.Messaging 4.0 2.0
+%gac_and_2dll System.ServiceProcess 4.0 2.0
+%gac_and_2dll System.ServiceModel 4.0 2.0
+%gac_and_1dll System.ServiceModel.Discovery 4.0
+%gac_and_1dll System.ServiceModel.Routing 4.0
+%gac_and_2dll Mono.Messaging.RabbitMQ 4.0 2.0
+%gac_and_2dll Mono.Messaging 4.0 2.0
+%gac_and_2dll RabbitMQ.Client 4.0 2.0
+%{mono_dir}/4.0/RabbitMQ.Client.Apigen.exe*
 %{mono_dir}/2.0/RabbitMQ.Client.Apigen.exe*
 
 %files winforms
 %defattr(-,root,root,-)
-%gac_and_2dll System.Windows.Forms 2.0 1.0
-%gac_and_2dll Accessibility 2.0 1.0
-%gac_and_2dll System.Design 2.0 1.0
-%gac_and_2dll System.Drawing.Design 2.0 1.0
+%gac_and_2dll Accessibility 4.0 2.0
+%gac_and_2dll System.Design 4.0 2.0
+%gac_and_2dll System.Drawing.Design 4.0 2.0
+%gac_and_2dll System.Windows.Forms 4.0 2.0
+%gac_and_1dll System.Windows.Forms.DataVisualization 4.0
 
 %files web
 %defattr(-,root,root,-)
-%bin_and_exe httpcfg 2.0/httpcfg
-
-%bin_and_exe disco 1.0/disco
-%bin_and_exe soapsuds 1.0/soapsuds
-%bin_and_exe wsdl 1.0/wsdl
-%{_bindir}/wsdl1
-%bin_and_exe wsdl2 2.0/wsdl
-%bin_and_exe xsd2 2.0/xsd
-%bin_and_exe xsd 1.0/xsd
-
-%gac_and_2dll Mono.Http 2.0 1.0
-%gac_and_1dll Mono.Web 2.0
-%gac_and_2dll Mono.WebBrowser 2.0 1.0
-%gac_and_2dll System.Runtime.Remoting 2.0 1.0
-%gac_and_2dll System.Web 2.0 1.0
-%gac_and_2dll System.Runtime.Serialization.Formatters.Soap 2.0 1.0
+%{mono_dir}/2.0/xsd.exe*
 %{mono_dir}/compat-2.0/System.Web.Extensions*dll
 %{mono_dir}/compat-2.0/System.Web.Mvc.dll
-%gac_and_1dll System.ServiceModel.Web 2.0
-%gac_and_1dll System.Web.Abstractions 2.0
-%gac_and_1dll System.Web.DynamicData 2.0
+%bin_and_exe disco 4.0/disco
+%bin_and_exe soapsuds 4.0/soapsuds
+%bin_and_exe xsd 4.0/xsd
+%bin_and_exe wsdl 4.0/wsdl
+%bin_and_exe wsdl2 2.0/wsdl
+%bin_and_exe httpcfg 4.0/httpcfg
+%gac_and_2dll Mono.Http 4.0 2.0
+%gac_and_2dll Mono.Web 4.0 2.0
+%gac_and_2dll Mono.WebBrowser 4.0 2.0
+%gac_and_2dll System.Runtime.Remoting 4.0 2.0
+%gac_and_2dll System.Runtime.Serialization.Formatters.Soap 4.0 2.0
+%gac_and_2dll System.ServiceModel.Web 4.0 2.0
+%gac_and_2dll System.Web 4.0 2.0
+%gac_and_1dll System.Web.ApplicationServices 4.0
+%gac_and_2dll System.Web.Abstractions 4.0 2.0
+%gac_and_2dll System.Web.DynamicData 4.0 2.0
 %gac_and_1dll System.Web.Mvc 2.0
-%gac_and_1dll System.Web.Routing 2.0
-%gac_and_2dll System.Web.Services 2.0 1.0
-%gac_and_2dll System.Web.Extensions.Design 3.5 2.0
-%gac_and_1dll System.Web.Extensions 2.0
+%gac_and_2dll System.Web.Routing 4.0 2.0
+%gac_and_2dll System.Web.Services 4.0 2.0
+%gac_and_3dll System.Web.Extensions.Design 4.0 3.5 2.0
+%gac_and_2dll System.Web.Extensions 4.0 2.0
 %{_mandir}/man1/disco.1.gz
 %{_mandir}/man1/soapsuds.1.gz
 %{_mandir}/man1/wsdl.1.gz
 %{_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/4.0/DefaultWsdlHelpGenerator.aspx
 %config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx
+%config (noreplace) %{_sysconfdir}/mono/4.0/web.config
 %config (noreplace) %{_sysconfdir}/mono/2.0/web.config
 %{_mandir}/man1/httpcfg.1.gz
 %{_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
+%{_libdir}/pkgconfig/system.web.mvc2.pc
 
 %files data
 %defattr(-,root,root,-)
-%bin_and_exe sqlsharp 2.0/sqlsharp
-%{mono_dir}/gac/System.Data.Services
-%gac_and_2dll System.Data 2.0 1.0
-%gac_and_1dll System.Data.DataSetExtensions 2.0
-%gac_and_1dll System.Data.Linq 2.0
-%gac_and_2dll Mono.Data 2.0 1.0
-%gac_and_2dll Mono.Data.Tds 2.0 1.0
-%gac_and_2dll Mono.Data.TdsClient 2.0 1.0
-%gac_and_2dll System.EnterpriseServices 2.0 1.0
-%gac_and_2dll Novell.Directory.Ldap 2.0 1.0
-%gac_and_2dll System.DirectoryServices 2.0 1.0
-%gac_and_1dll System.Transactions 2.0
+%bin_and_exe sqlsharp 4.0/sqlsharp
+%gac_and_2dll System.Data 4.0 2.0
+%gac_and_2dll System.Data.DataSetExtensions 4.0 2.0
+%gac_and_2dll System.Data.Linq 4.0 2.0
+%gac_and_2dll System.Data.Services 4.0 2.0
+%gac_and_2dll Mono.Data.Tds 4.0 2.0
+%gac_and_2dll System.EnterpriseServices 4.0 2.0
+%gac_and_2dll Novell.Directory.Ldap 4.0 2.0
+%gac_and_2dll System.DirectoryServices 4.0 2.0
+%gac_and_2dll System.Transactions 4.0 2.0
+%{mono_dir}/gac/System.Data.Services.Client
 %{_mandir}/man1/sqlsharp.1.gz
 
 %files data-sqlite
 %defattr(-,root,root,-)
-%gac_and_2dll Mono.Data.SqliteClient 2.0 1.0
-%gac_and_2dll Mono.Data.Sqlite 2.0 1.0
-
-%files data-sybase
-%defattr(-,root,root,-)
-%gac_and_2dll Mono.Data.SybaseClient 2.0 1.0
+%gac_and_2dll Mono.Data.Sqlite 4.0 2.0
 
 %files data-oracle
 %defattr(-,root,root,-)
-%gac_and_2dll System.Data.OracleClient 2.0 1.0
+%gac_and_2dll System.Data.OracleClient 4.0 2.0
 
 %files data-postgresql
 %defattr(-,root,root,-)
-%gac_and_2dll Npgsql 2.0 1.0
-
-%files data-firebird
-%defattr(-,root,root,-)
-%gac_and_1dll FirebirdSql.Data.Firebird 1.0
-
-%files -n bytefx-data-mysql
-%defattr(-,root,root,-)
-%gac_and_2dll ByteFX.Data 2.0 1.0
+%gac_and_2dll Npgsql 4.0 2.0
 
 %files -n ibm-data-db2
 %defattr(-,root,root,-)
-%gac_and_2dll IBM.Data.DB2 2.0 1.0
+%gac_and_2dll IBM.Data.DB2 4.0 2.0
 
 %files -n monodoc
 %defattr(-, root, root)
-%bin_and_exe mdoc 2.0/mdoc
+%bin_and_exe mdoc 4.0/mdoc
 %{_bindir}/mdoc-*
 %{_bindir}/mdass*
 %{_bindir}/mdval*
@@ -656,7 +629,21 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man5/mdoc*
 %{_libdir}/pkgconfig/monodoc.pc
 
+
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 2.8-1
+- updated mono to 2.8
+- modified macros used in %%files
+- removed below:
+  - packages:
+    %{name}-jscript, %{name}-data-sybase, %{name}-data-firebird, bytefx-data-mysql
+  - libraries:
+    ByteFX.Data, FirebirdSql.Data.Firebird
+    Mono.Data Mono.Data.TdsClient, Mono.Data.SybaseClient, Mono.Data.SqliteClient
+    Microsoft.JScript, Microsoft.Vsa
+  - commands:
+    cilc, mjs, prj2make (replaced by xbuild)
+
 * Tue Sep 21 2010 IWAI, Masaharu <iwai@alib.jp> 2.6.7-2
 - build with rpm-4.8.1-1 for pkg-config file
 

m/monodevelop/monodevelop-vl.spec

@@ -3,7 +3,7 @@ Summary: A Full-Featured IDE for Mono and Gtk#
 Summary(ja): Gtk# 版 Mono 統合開発環境
 Name: monodevelop
 Version: 2.4
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: LGPL2.1
 Group: Applications/Development
 BuildArch: noarch
@@ -91,6 +91,9 @@ update-mime-database /usr/share/mime >/dev/null || :
 
 
 %changelog
+* Sat Oct 09 2010 Shu KONNO <owa@bg.wakwak.com> 2.4-4
+- rebuilt with mono-2.8
+
 * Wed Oct 06 2010 Shu KONNO <owa@bg.wakwak.com> 2.4-3
 - rebuilt with rpm-4.8.1 for pkg-config
 

n/ndesk-dbus-glib/ndesk-dbus-glib-vl.spec

@@ -1,7 +1,7 @@
 %define mono_dir %{_prefix}/lib/mono
 %define pkgconfigdir %{_datadir}/pkgconfig
 %define pkg_version	0.4.1
-%define pkg_release	6%{?_dist_release}
+%define pkg_release	7%{?_dist_release}
 
 Summary:	GLib main loop integration for ndesk-dbus
 Summary(ja): 	ndesk-dbus の Glib 用ライブラリ
@@ -53,6 +53,9 @@ make install DESTDIR=${RPM_BUILD_ROOT} pkgconfigdir=%{pkgconfigdir}
 
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 0.4.1-7
+- rebuilt with mono-2.8
+
 * Wed Oct 06 2010 Shu KONNO <owa@bg.wakwak.com> 0.4.1-6
 - rebuilt with rpm-4.8.1 for pkg-config
 

n/ndesk-dbus/ndesk-dbus-vl.spec

@@ -5,7 +5,7 @@ Summary:	C# implementation of D-Bus
 Summary(ja): 	D-BUs の C# による実装
 Name:		ndesk-dbus
 Version:	0.6.0
-Release: 	7%{?_dist_release}
+Release: 	8%{?_dist_release}
 Source0:	%{name}-%{version}.tar.gz
 License:	MIT
 Group:		System Environment/Libraries
@@ -54,6 +54,9 @@ make install DESTDIR=${RPM_BUILD_ROOT} pkgconfigdir=%{pkgconfigdir}
 
 
 %changelog
+* Fri Oct 08 2010 Shu KONNO <owa@bg.wakwak.com> 0.6.0-8
+- rebuilt with mono-2.8
+
 * Wed Oct 06 2010 Shu KONNO <owa@bg.wakwak.com> 0.6.0-7
 - rebuilt with rpm-4.8.1 for pkg-config
 

x/xsp/xsp-vl.spec

@@ -5,13 +5,13 @@ Name: xsp
 URL: http://go-mono.com/
 License: GNU General Public License (GPL)
 Group: Applications/Internet
-Version: 2.6.5
-Release: 2%{?_dist_release}
+Version: 2.8
+Release: 1%{?_dist_release}
 Source: http://mono.ximian.com/monobuild/preview/sources/xsp/xsp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 BuildRequires: mono-devel mono-web
-BuildRequires: mono-data-sqlite mono-data-oracle mono-jscript mono-extras mono-nunit
+BuildRequires: mono-data-sqlite mono-data-oracle mono-extras mono-nunit
 BuildRequires: pkgconfig
 # One of the test runs requires this
 BuildRequires: sqlite
@@ -58,27 +58,32 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README
 %{_bindir}/*
 %{_prefix}/lib/xsp
-%{mono_dir}/gac/Mono.WebServer
-%{mono_dir}/1.0/Mono.WebServer.dll
 %{mono_dir}/gac/Mono.WebServer2
-%{mono_dir}/2.0/Mono.WebServer2.dll
-%{mono_dir}/gac/xsp
-%{mono_dir}/1.0/xsp.exe
-%{mono_dir}/gac/xsp2
-%{mono_dir}/2.0/xsp2.exe
-%{mono_dir}/gac/mod-mono-server
-%{mono_dir}/1.0/mod-mono-server.exe
-%{mono_dir}/gac/mod-mono-server2
-%{mono_dir}/2.0/mod-mono-server2.exe
-%{mono_dir}/gac/fastcgi-mono-server
-%{mono_dir}/1.0/fastcgi-mono-server.exe
 %{mono_dir}/gac/fastcgi-mono-server2
+%{mono_dir}/gac/fastcgi-mono-server4
+%{mono_dir}/gac/mod-mono-server2
+%{mono_dir}/gac/mod-mono-server4
+%{mono_dir}/gac/xsp2
+%{mono_dir}/gac/xsp4
+%{mono_dir}/2.0/Mono.WebServer2.dll
 %{mono_dir}/2.0/fastcgi-mono-server2.exe
+%{mono_dir}/2.0/mod-mono-server2.exe
+%{mono_dir}/2.0/xsp2.exe
+%{mono_dir}/4.0/Mono.WebServer2.dll
+%{mono_dir}/4.0/fastcgi-mono-server4.exe
+%{mono_dir}/4.0/mod-mono-server4.exe
+%{mono_dir}/4.0/xsp4.exe
+%{_prefix}/lib/monodoc/sources/Mono.WebServer.*
 %{_datadir}/pkgconfig/*
 %{_mandir}/*/*
 
 
 %changelog
+* Fri Oct 08 2010 2010 Shu KONNO <owa@bg.wakwak.com> 2.8-1
+- updated xsp to 2.8
+- rebuilt with mono-2.8
+- dropt BR: mono-jscript
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.6.5-2
 - rebuild with rpm-4.8.1 for pkg-config file