X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono-core.spec.in;h=cdbcc9ce7c200293c1e9c6b345e65c9398c57490;hb=e482c4db5e7393fb76731cfff7a507d1f2cb290c;hp=7592c7955f170d6801806de77cf6108676a68735;hpb=01e05e49f0e78d9b6d47e8cba31730c6045f4229;p=mono.git

diff --git a/mono-core.spec.in b/mono-core.spec.in
index 7592c7955f1..cdbcc9ce7c2 100644
--- a/mono-core.spec.in
+++ b/mono-core.spec.in
@@ -1,5 +1,4 @@
 %{!?ext_man: %define ext_man .gz}
-
 Name:           mono-core
 License:        LGPL v2.1 only
 Group:          Development/Languages/Mono
@@ -38,7 +37,7 @@ Recommends:     libgdiplus0
 Requires:       libgdiplus0
 %endif
 BuildRequires:  gcc-c++
-BuildRequires:  glib2-devel zlib-devel
+BuildRequires:  pkgconfig zlib-devel
 #######  distro specific changes  ########
 #####
 #### suse options ####
@@ -112,105 +111,164 @@ Authors:
 %files -f mcs.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
-%_bindir/mono
-%_libdir/libmono.so.*
-%_mandir/man1/mono.1%ext_man
-# manpages
-%_mandir/man5/mono-config.5%ext_man
-%_mandir/man1/mcs.1%ext_man
-%_mandir/man1/certmgr.1%ext_man
-%_mandir/man1/chktrust.1%ext_man
-%_mandir/man1/csharp.1%ext_man
-%_mandir/man1/setreg.1%ext_man
-%_mandir/man1/gacutil.1%ext_man
-%_mandir/man1/sn.1%ext_man
-%_mandir/man1/mozroots.1%ext_man
-# wrappers
+%config %_sysconfdir/mono/2.0/machine.config
+%config %_sysconfdir/mono/2.0/settings.map
+%config %_sysconfdir/mono/4.0/machine.config
+%config %_sysconfdir/mono/4.0/settings.map
+%config %_sysconfdir/mono/config
+%dir %_prefix/lib/mono
+%dir %_prefix/lib/mono/2.0
+%dir %_prefix/lib/mono/3.5
+%dir %_prefix/lib/mono/4.0
+%dir %_prefix/lib/mono/gac
+%dir %_sysconfdir/mono
+%dir %_sysconfdir/mono/2.0
+%dir %_sysconfdir/mono/4.0
 %_bindir/certmgr
 %_bindir/chktrust
 %_bindir/csharp
+%_bindir/csharp2
+%_bindir/dmcs
 %_bindir/gacutil
 %_bindir/gacutil2
 %_bindir/gmcs
-%_bindir/mono-test-install
 %_bindir/mcs
+%_bindir/mono
+%_bindir/mono-configuration-crypto
+%_bindir/mono-test-install
 %_bindir/mozroots
+%_bindir/peverify
 %_bindir/setreg
 %_bindir/sn
-# exes
-%_prefix/lib/mono/2.0/gacutil.exe*
-%_prefix/lib/mono/2.0/csharp.exe*
-%_prefix/lib/mono/2.0/gmcs.exe*
-%_prefix/lib/mono/gac/cscompmgd
-%_prefix/lib/mono/2.0/cscompmgd.dll
-%_prefix/lib/mono/gac/I18N.West
+%_libdir/libMonoPosixHelper.so*
+%_libdir/libikvm-native.so
+%_mandir/man1/certmgr.1%ext_man
+%_mandir/man1/chktrust.1%ext_man
+%_mandir/man1/csharp.1%ext_man
+%_mandir/man1/gacutil.1%ext_man
+%_mandir/man1/mcs.1%ext_man
+%_mandir/man1/mono-configuration-crypto.1%ext_man
+%_mandir/man1/mono.1%ext_man
+%_mandir/man1/mozroots.1%ext_man
+%_mandir/man1/setreg.1%ext_man
+%_mandir/man1/sn.1%ext_man
+%_mandir/man5/mono-config.5%ext_man
+%_prefix/lib/mono/2.0/Commons.Xml.Relaxng.dll
+%_prefix/lib/mono/2.0/CustomMarshalers.dll
 %_prefix/lib/mono/2.0/I18N.West.dll
-%_prefix/lib/mono/gac/I18N
 %_prefix/lib/mono/2.0/I18N.dll
-%_prefix/lib/mono/gac/Mono.CompilerServices.SymbolWriter
+%_prefix/lib/mono/2.0/ICSharpCode.SharpZipLib.dll
+%_prefix/lib/mono/2.0/Microsoft.VisualC.dll
+%_prefix/lib/mono/2.0/Mono.C5.dll
+%_prefix/lib/mono/2.0/Mono.CSharp.dll
+%_prefix/lib/mono/2.0/Mono.Cairo.dll
 %_prefix/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll
-%_prefix/lib/mono/gac/Mono.GetOptions
-%_prefix/lib/mono/2.0/Mono.GetOptions.dll
-%_prefix/lib/mono/gac/Mono.Simd
-%_prefix/lib/mono/2.0/Mono.Simd.dll
-%_prefix/lib/mono/gac/Mono.Management
 %_prefix/lib/mono/2.0/Mono.Management.dll
-%_prefix/lib/mono/gac/Mono.Tasklets
-%_prefix/lib/mono/2.0/Mono.Tasklets.dll
-%_prefix/lib/mono/gac/Mono.Security
+%_prefix/lib/mono/2.0/Mono.Posix.dll
 %_prefix/lib/mono/2.0/Mono.Security.dll
-%_prefix/lib/mono/gac/System.Security
+%_prefix/lib/mono/2.0/Mono.Simd.dll
+%_prefix/lib/mono/2.0/Mono.Tasklets.dll
+%_prefix/lib/mono/2.0/OpenSystem.C.dll
+%_prefix/lib/mono/2.0/System.Configuration.dll
+%_prefix/lib/mono/2.0/System.Core.dll
+%_prefix/lib/mono/2.0/System.Drawing.dll
 %_prefix/lib/mono/2.0/System.Security.dll
-%_prefix/lib/mono/gac/System.Xml
-%_prefix/lib/mono/2.0/System.Xml.dll
-%_prefix/lib/mono/gac/System.Xml.Linq
 %_prefix/lib/mono/2.0/System.Xml.Linq.dll
-%_prefix/lib/mono/gac/System
+%_prefix/lib/mono/2.0/System.Xml.dll
 %_prefix/lib/mono/2.0/System.dll
-%_prefix/lib/mono/gac/System.Configuration
-%_prefix/lib/mono/2.0/System.Configuration.dll
+%_prefix/lib/mono/2.0/cscompmgd.dll
+%_prefix/lib/mono/2.0/csharp.exe*
+%_prefix/lib/mono/2.0/gacutil.exe*
+%_prefix/lib/mono/2.0/gmcs.exe*
 %_prefix/lib/mono/2.0/mscorlib.dll*
-%dir %_sysconfdir/mono
-%dir %_sysconfdir/mono/2.0
-%dir %_prefix/lib/mono
-%dir %_prefix/lib/mono/2.0
-%dir %_prefix/lib/mono/3.5
-%dir %_prefix/lib/mono/gac
-%config %_sysconfdir/mono/config
-%config %_sysconfdir/mono/2.0/machine.config
-%config %_sysconfdir/mono/2.0/settings.map
-%_prefix/lib/mono/gac/Mono.C5
-%_prefix/lib/mono/2.0/Mono.C5.dll
-# ikvm helper
-%_prefix/%_lib/libikvm-native.so
-%_prefix/lib/mono/gac/System.Drawing
-%_prefix/lib/mono/2.0/System.Drawing.dll
-%_libdir/libMonoPosixHelper.so*
-%_prefix/lib/mono/gac/Mono.Posix
-%_prefix/lib/mono/2.0/Mono.Posix.dll
-%_prefix/lib/mono/gac/Mono.Cairo
-%_prefix/lib/mono/2.0/Mono.Cairo.dll
-%_prefix/lib/mono/gac/ICSharpCode.SharpZipLib
-%_prefix/lib/mono/2.0/ICSharpCode.SharpZipLib.dll
+%_prefix/lib/mono/4.0/Commons.Xml.Relaxng.dll
+%_prefix/lib/mono/4.0/CustomMarshalers.dll
+%_prefix/lib/mono/4.0/I18N.West.dll
+%_prefix/lib/mono/4.0/I18N.dll
+%_prefix/lib/mono/4.0/ICSharpCode.SharpZipLib.dll
+%_prefix/lib/mono/4.0/Microsoft.CSharp.dll
+%_prefix/lib/mono/4.0/Microsoft.VisualC.dll
+%_prefix/lib/mono/4.0/Mono.C5.dll
+%_prefix/lib/mono/4.0/Mono.CSharp.dll
+%_prefix/lib/mono/4.0/Mono.Cairo.dll
+%_prefix/lib/mono/4.0/Mono.CompilerServices.SymbolWriter.dll
+%_prefix/lib/mono/4.0/Mono.Management.dll
+%_prefix/lib/mono/4.0/Mono.Posix.dll
+%_prefix/lib/mono/4.0/Mono.Security.dll
+%_prefix/lib/mono/4.0/Mono.Simd.dll
+%_prefix/lib/mono/4.0/Mono.Tasklets.dll
+%_prefix/lib/mono/4.0/OpenSystem.C.dll
+%_prefix/lib/mono/4.0/System.Configuration.dll
+%_prefix/lib/mono/4.0/System.Core.dll
+%_prefix/lib/mono/4.0/System.Drawing.dll
+%_prefix/lib/mono/4.0/System.Dynamic.dll
+%_prefix/lib/mono/4.0/System.Numerics.dll
+%_prefix/lib/mono/4.0/System.Security.dll
+%_prefix/lib/mono/4.0/System.Xml.Linq.dll
+%_prefix/lib/mono/4.0/System.Xml.dll
+%_prefix/lib/mono/4.0/System.dll
+%_prefix/lib/mono/4.0/certmgr.exe*
+%_prefix/lib/mono/4.0/chktrust.exe*
+%_prefix/lib/mono/4.0/cscompmgd.dll
+%_prefix/lib/mono/4.0/csharp.exe*
+%_prefix/lib/mono/4.0/dmcs.exe*
+%_prefix/lib/mono/4.0/gacutil.exe*
+%_prefix/lib/mono/4.0/mozroots.exe*
+%_prefix/lib/mono/4.0/mscorlib.dll*
+%_prefix/lib/mono/4.0/setreg.exe*
+%_prefix/lib/mono/4.0/sn.exe*
 %_prefix/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll
-%_prefix/lib/mono/gac/Microsoft.VisualC
-%_prefix/lib/mono/2.0/Microsoft.VisualC.dll
+%_prefix/lib/mono/compat-4.0/ICSharpCode.SharpZipLib.dll
 %_prefix/lib/mono/gac/Commons.Xml.Relaxng
-%_prefix/lib/mono/2.0/Commons.Xml.Relaxng.dll
 %_prefix/lib/mono/gac/CustomMarshalers
-%_prefix/lib/mono/2.0/CustomMarshalers.dll
-%_prefix/lib/mono/gac/OpenSystem.C
-%_prefix/lib/mono/2.0/OpenSystem.C.dll
-%_prefix/lib/mono/gac/System.Core
-%_prefix/lib/mono/2.0/System.Core.dll
+%_prefix/lib/mono/gac/I18N
+%_prefix/lib/mono/gac/I18N.West
+%_prefix/lib/mono/gac/ICSharpCode.SharpZipLib
+%_prefix/lib/mono/gac/Microsoft.CSharp
+%_prefix/lib/mono/gac/Microsoft.VisualC
+%_prefix/lib/mono/gac/Mono.C5
 %_prefix/lib/mono/gac/Mono.CSharp
-%_prefix/lib/mono/2.0/Mono.CSharp.dll
+%_prefix/lib/mono/gac/Mono.Cairo
 %_prefix/lib/mono/gac/Mono.Cecil
-# localizations?
-#%_datadir/locale/*/LC_MESSAGES/mcs.mo
-# Not sure if autobuild allows this...
+%_prefix/lib/mono/gac/Mono.Cecil.Mdb
+%_prefix/lib/mono/gac/Mono.CompilerServices.SymbolWriter
+%_prefix/lib/mono/gac/Mono.Management
+%_prefix/lib/mono/gac/Mono.Posix
+%_prefix/lib/mono/gac/Mono.Security
+%_prefix/lib/mono/gac/Mono.Simd
+%_prefix/lib/mono/gac/Mono.Tasklets
+%_prefix/lib/mono/gac/OpenSystem.C
+%_prefix/lib/mono/gac/System
+%_prefix/lib/mono/gac/System.Configuration
+%_prefix/lib/mono/gac/System.Core
+%_prefix/lib/mono/gac/System.Drawing
+%_prefix/lib/mono/gac/System.Dynamic
+%_prefix/lib/mono/gac/System.Numerics
+%_prefix/lib/mono/gac/System.Security
+%_prefix/lib/mono/gac/System.Xml
+%_prefix/lib/mono/gac/System.Xml.Linq
+%_prefix/lib/mono/gac/cscompmgd
+%_prefix/lib/mono/mono-configuration-crypto
+
+%package -n libmono-2_0-1
+License:        LGPL v2.1 only
+Summary:	A Library for embedding Mono in your Application
+Group:          Development/Libraries/C and C++
+
+%description -n libmono-2_0-1
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+A Library for embedding Mono in your Application.
+
+%files -n libmono-2_0-1
+%defattr(-, root, root)
+%_libdir/libmono-2.0.so.1*
 
-%post
+%post -n libmono-2_0-1
 /sbin/ldconfig
 %ifarch s390 s390x
 if grep -q "machine = 9672" /proc/cpuinfo 2>/dev/null ; then
@@ -219,33 +277,28 @@ if grep -q "machine = 9672" /proc/cpuinfo 2>/dev/null ; then
 fi
 %endif
 
-%postun -p /sbin/ldconfig
+%postun -n libmono-2_0-1 -p /sbin/ldconfig
 
-%package -n mono-jscript
+%package -n libmono-2_0-devel
 License:        LGPL v2.1 only
-Summary:        JScript .NET support for Mono
+Summary:	Development files for libmono
 Group:          Development/Languages/Mono
-Requires:       mono-core == %version-%release
-
-%description -n mono-jscript
-This package contains the JScript .NET compiler and language runtime.
-This allows you to compile and run JScript.NET application and
-assemblies.
-
 
+%description -n libmono-2_0-devel
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
 
-Authors:
---------
-    Miguel de Icaza <miguel@ximian.com>
-    Paolo Molaro <lupus@ximian.com>
-    Dietmar Maurer <dietmar@ximian.com>
+Development files for libmono.
 
-%files -n mono-jscript
+%files -n libmono-2_0-devel
 %defattr(-, root, root)
-%_bindir/mjs
-%_prefix/lib/mono/2.0/mjs.exe*
-%_prefix/lib/mono/gac/Microsoft.JScript
-%_prefix/lib/mono/2.0/Microsoft.JScript.dll
+%_libdir/libmono-2.0.a
+%_libdir/libmono-2.0.so
+%_libdir/pkgconfig/mono-2.pc
+%_includedir/mono-2.0
 
 %package -n mono-locale-extras
 License:        LGPL v2.1 only
@@ -272,14 +325,18 @@ Authors:
 
 %files -n mono-locale-extras
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/I18N.MidEast
+%_prefix/lib/mono/2.0/I18N.CJK.dll
 %_prefix/lib/mono/2.0/I18N.MidEast.dll
-%_prefix/lib/mono/gac/I18N.Rare
+%_prefix/lib/mono/2.0/I18N.Other.dll
 %_prefix/lib/mono/2.0/I18N.Rare.dll
+%_prefix/lib/mono/4.0/I18N.CJK.dll
+%_prefix/lib/mono/4.0/I18N.MidEast.dll
+%_prefix/lib/mono/4.0/I18N.Other.dll
+%_prefix/lib/mono/4.0/I18N.Rare.dll
 %_prefix/lib/mono/gac/I18N.CJK
-%_prefix/lib/mono/2.0/I18N.CJK.dll
+%_prefix/lib/mono/gac/I18N.MidEast
 %_prefix/lib/mono/gac/I18N.Other
-%_prefix/lib/mono/2.0/I18N.Other.dll
+%_prefix/lib/mono/gac/I18N.Rare
 
 %package -n mono-data
 License:        LGPL v2.1 only
@@ -312,32 +369,36 @@ Authors:
 
 %files -n mono-data
 %defattr(-, root, root)
-%_prefix/lib/mono/2.0/sqlmetal.exe*
-%_prefix/lib/mono/2.0/sqlsharp.exe*
 %_bindir/sqlmetal
 %_bindir/sqlsharp
 %_mandir/man1/sqlsharp.1%ext_man
-%_prefix/lib/mono/gac/System.Data
-%_prefix/lib/mono/2.0/System.Data.dll
-%_prefix/lib/mono/gac/System.Data.Linq
-%_prefix/lib/mono/2.0/System.Data.Linq.dll
-%_prefix/lib/mono/gac/System.Data.Services
-%_prefix/lib/mono/gac/Mono.Data
-%_prefix/lib/mono/2.0/Mono.Data.dll
-%_prefix/lib/mono/gac/Mono.Data.Tds
 %_prefix/lib/mono/2.0/Mono.Data.Tds.dll
-%_prefix/lib/mono/gac/Mono.Data.TdsClient
-%_prefix/lib/mono/2.0/Mono.Data.TdsClient.dll
-%_prefix/lib/mono/gac/System.EnterpriseServices
-%_prefix/lib/mono/2.0/System.EnterpriseServices.dll
-%_prefix/lib/mono/gac/Novell.Directory.Ldap
 %_prefix/lib/mono/2.0/Novell.Directory.Ldap.dll
-%_prefix/lib/mono/gac/System.DirectoryServices
+%_prefix/lib/mono/2.0/System.Data.DataSetExtensions.dll
+%_prefix/lib/mono/2.0/System.Data.Linq.dll
+%_prefix/lib/mono/2.0/System.Data.dll
 %_prefix/lib/mono/2.0/System.DirectoryServices.dll
-%_prefix/lib/mono/gac/System.Transactions
+%_prefix/lib/mono/2.0/System.EnterpriseServices.dll
 %_prefix/lib/mono/2.0/System.Transactions.dll
+%_prefix/lib/mono/4.0/Mono.Data.Tds.dll
+%_prefix/lib/mono/4.0/Novell.Directory.Ldap.dll
+%_prefix/lib/mono/4.0/System.Data.DataSetExtensions.dll
+%_prefix/lib/mono/4.0/System.Data.Linq.dll
+%_prefix/lib/mono/4.0/System.Data.dll
+%_prefix/lib/mono/4.0/System.DirectoryServices.dll
+%_prefix/lib/mono/4.0/System.EnterpriseServices.dll
+%_prefix/lib/mono/4.0/System.Transactions.dll
+%_prefix/lib/mono/4.0/sqlmetal.exe*
+%_prefix/lib/mono/4.0/sqlsharp.exe*
+%_prefix/lib/mono/gac/Mono.Data.Tds
+%_prefix/lib/mono/gac/Novell.Directory.Ldap
+%_prefix/lib/mono/gac/System.Data
 %_prefix/lib/mono/gac/System.Data.DataSetExtensions
-%_prefix/lib/mono/2.0/System.Data.DataSetExtensions.dll
+%_prefix/lib/mono/gac/System.Data.Linq
+%_prefix/lib/mono/gac/System.Data.Services
+%_prefix/lib/mono/gac/System.DirectoryServices
+%_prefix/lib/mono/gac/System.EnterpriseServices
+%_prefix/lib/mono/gac/System.Transactions
 
 %package -n mono-winforms
 License:        LGPL v2.1 only
@@ -366,16 +427,23 @@ Authors:
 
 %files -n mono-winforms
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/System.Windows.Forms
-%_prefix/lib/mono/2.0/System.Windows.Forms.dll
-%_prefix/lib/mono/gac/Accessibility
 %_prefix/lib/mono/2.0/Accessibility.dll
-%_prefix/lib/mono/gac/System.Design
+%_prefix/lib/mono/2.0/Mono.WebBrowser.dll
 %_prefix/lib/mono/2.0/System.Design.dll
-%_prefix/lib/mono/gac/System.Drawing.Design
 %_prefix/lib/mono/2.0/System.Drawing.Design.dll
-%_prefix/lib/mono/2.0/Mono.WebBrowser.dll
+%_prefix/lib/mono/2.0/System.Windows.Forms.dll
+%_prefix/lib/mono/4.0/Accessibility.dll
+%_prefix/lib/mono/4.0/Mono.WebBrowser.dll
+%_prefix/lib/mono/4.0/System.Design.dll
+%_prefix/lib/mono/4.0/System.Drawing.Design.dll
+%_prefix/lib/mono/4.0/System.Windows.Forms.DataVisualization.dll
+%_prefix/lib/mono/4.0/System.Windows.Forms.dll
+%_prefix/lib/mono/gac/Accessibility
 %_prefix/lib/mono/gac/Mono.WebBrowser
+%_prefix/lib/mono/gac/System.Design
+%_prefix/lib/mono/gac/System.Drawing.Design
+%_prefix/lib/mono/gac/System.Windows.Forms
+%_prefix/lib/mono/gac/System.Windows.Forms.DataVisualization
 
 %package -n ibm-data-db2
 License:        LGPL v2.1 only
@@ -402,8 +470,9 @@ Authors:
 
 %files -n ibm-data-db2
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/IBM.Data.DB2
 %_prefix/lib/mono/2.0/IBM.Data.DB2.dll
+%_prefix/lib/mono/4.0/IBM.Data.DB2.dll
+%_prefix/lib/mono/gac/IBM.Data.DB2
 
 %package -n mono-extras
 License:        LGPL v2.1 only
@@ -432,29 +501,40 @@ Authors:
 
 %files -n mono-extras
 %defattr(-, root, root)
-%_mandir/man1/mono-service.1%ext_man
 %_bindir/mono-service
 %_bindir/mono-service2
-%_prefix/lib/mono/2.0/installutil.exe*
-# These are errors because they should be symlinks, but they are copies, so rpmlint detects duplicate files
-%_prefix/lib/mono/gac/mono-service
-%_prefix/lib/mono/2.0/mono-service.exe*
-%_prefix/lib/mono/gac/System.Management
-%_prefix/lib/mono/2.0/System.Management.dll
-%_prefix/lib/mono/gac/RabbitMQ.Client
+%_mandir/man1/mono-service.1%ext_man
+%_prefix/lib/mono/2.0/Mono.Messaging.RabbitMQ.dll
+%_prefix/lib/mono/2.0/Mono.Messaging.dll
+%_prefix/lib/mono/2.0/RabbitMQ.Client.Apigen.exe*
 %_prefix/lib/mono/2.0/RabbitMQ.Client.dll
-%_prefix/lib/mono/gac/System.Messaging
+%_prefix/lib/mono/2.0/System.Configuration.Install.dll
+%_prefix/lib/mono/2.0/System.Management.dll
 %_prefix/lib/mono/2.0/System.Messaging.dll
+%_prefix/lib/mono/2.0/System.ServiceProcess.dll
+%_prefix/lib/mono/2.0/mono-service.exe*
+%_prefix/lib/mono/4.0/Mono.Messaging.RabbitMQ.dll
+%_prefix/lib/mono/4.0/Mono.Messaging.dll
+%_prefix/lib/mono/4.0/RabbitMQ.Client.Apigen.exe*
+%_prefix/lib/mono/4.0/RabbitMQ.Client.dll
+%_prefix/lib/mono/4.0/System.Configuration.Install.dll
+%_prefix/lib/mono/4.0/System.Management.dll
+%_prefix/lib/mono/4.0/System.Messaging.dll
+%_prefix/lib/mono/4.0/System.Runtime.Caching.dll
+%_prefix/lib/mono/4.0/System.ServiceProcess.dll
+%_prefix/lib/mono/4.0/System.Xaml.dll
+%_prefix/lib/mono/4.0/installutil.exe*
+%_prefix/lib/mono/4.0/mono-service.exe*
 %_prefix/lib/mono/gac/Mono.Messaging
-%_prefix/lib/mono/2.0/Mono.Messaging.dll
 %_prefix/lib/mono/gac/Mono.Messaging.RabbitMQ
-%_prefix/lib/mono/2.0/Mono.Messaging.RabbitMQ.dll
-%_prefix/lib/mono/gac/System.ServiceProcess
-%_prefix/lib/mono/2.0/System.ServiceProcess.dll
+%_prefix/lib/mono/gac/RabbitMQ.Client
 %_prefix/lib/mono/gac/System.Configuration.Install
-%_prefix/lib/mono/2.0/System.Configuration.Install.dll
-%_prefix/lib/mono/gac/Microsoft.Vsa
-%_prefix/lib/mono/2.0/Microsoft.Vsa.dll
+%_prefix/lib/mono/gac/System.Management
+%_prefix/lib/mono/gac/System.Messaging
+%_prefix/lib/mono/gac/System.Runtime.Caching
+%_prefix/lib/mono/gac/System.ServiceProcess
+%_prefix/lib/mono/gac/System.Xaml
+%_prefix/lib/mono/gac/mono-service
 
 %package -n mono-data-sqlite
 License:        LGPL v2.1 only
@@ -484,26 +564,23 @@ Authors:
 
 %files -n mono-data-sqlite
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/Mono.Data.SqliteClient
-%_prefix/lib/mono/2.0/Mono.Data.SqliteClient.dll
-%_prefix/lib/mono/gac/Mono.Data.Sqlite
 %_prefix/lib/mono/2.0/Mono.Data.Sqlite.dll
+%_prefix/lib/mono/4.0/Mono.Data.Sqlite.dll
+%_prefix/lib/mono/gac/Mono.Data.Sqlite
 
-%package -n mono-data-sybase
-License:        LGPL v2.1 only
-Summary:        Database connectivity for Mono
+%package -n mono-wcf
+Summary:        Mono implementation of WCF, Windows Communication Foundation
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
-Requires:       mono-data == %version-%release
 
-%description -n mono-data-sybase
+%description -n mono-wcf
 The Mono Project is an open development initiative that is working to
 develop an open source, Unix version of the .NET development platform.
 Its objective is to enable Unix developers to build and deploy
 cross-platform .NET applications. The project will implement various
 technologies that have been submitted to the ECMA for standardization.
 
-Database connectivity for Mono.
+Mono implementation of WCF, Windows Communication Foundation
 
 
 
@@ -513,63 +590,48 @@ Authors:
     Paolo Molaro <lupus@ximian.com>
     Dietmar Maurer <dietmar@ximian.com>
 
-%files -n mono-data-sybase
+
+%files -n mono-wcf
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/Mono.Data.SybaseClient
-%_prefix/lib/mono/2.0/Mono.Data.SybaseClient.dll
+%_bindir/svcutil
+%_libdir/pkgconfig/wcf.pc
+%_prefix/lib/mono/2.0/System.IdentityModel.Selectors.dll
+%_prefix/lib/mono/2.0/System.IdentityModel.dll
+%_prefix/lib/mono/2.0/System.Runtime.Serialization.dll
+%_prefix/lib/mono/2.0/System.ServiceModel.Web.dll
+%_prefix/lib/mono/2.0/System.ServiceModel.dll
+%_prefix/lib/mono/4.0/System.IdentityModel.Selectors.dll
+%_prefix/lib/mono/4.0/System.IdentityModel.dll
+%_prefix/lib/mono/4.0/System.Runtime.Serialization.dll
+%_prefix/lib/mono/4.0/System.ServiceModel.Routing.dll
+%_prefix/lib/mono/4.0/System.ServiceModel.Web.dll
+%_prefix/lib/mono/4.0/System.ServiceModel.dll
+%_prefix/lib/mono/4.0/System.Web.ApplicationServices.dll
+%_prefix/lib/mono/4.0/svcutil.exe*
+%_prefix/lib/mono/gac/System.Data.Services.Client
+%_prefix/lib/mono/gac/System.IdentityModel
+%_prefix/lib/mono/gac/System.IdentityModel.Selectors
+%_prefix/lib/mono/gac/System.Runtime.Serialization
+%_prefix/lib/mono/gac/System.ServiceModel
+%_prefix/lib/mono/gac/System.ServiceModel.Routing
+%_prefix/lib/mono/gac/System.ServiceModel.Web
+%_prefix/lib/mono/gac/System.Web.ApplicationServices
 
-%package -n mono-wcf
-Summary:        Mono implementation of WCF, Windows Communication Foundation
+
+%package -n mono-winfxcore
+License:        MIT License (or similar) ; Ms-Pl
+Summary:        Mono implementation of core WinFX APIs
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 
-%description -n mono-wcf
+%description -n mono-winfxcore
 The Mono Project is an open development initiative that is working to
 develop an open source, Unix version of the .NET development platform.
 Its objective is to enable Unix developers to build and deploy
 cross-platform .NET applications. The project will implement various
 technologies that have been submitted to the ECMA for standardization.
 
-Mono implementation of WCF, Windows Communication Foundation
-
-
-
-Authors:
---------
-    Miguel de Icaza <miguel@ximian.com>
-    Paolo Molaro <lupus@ximian.com>
-    Dietmar Maurer <dietmar@ximian.com>
-
-
-%files -n mono-wcf
-%defattr(-, root, root)
-%_bindir/svcutil
-%_prefix/lib/mono/gac/System.IdentityModel
-%_prefix/lib/mono/2.0/System.IdentityModel.dll
-%_prefix/lib/mono/gac/System.IdentityModel.Selectors
-%_prefix/lib/mono/2.0/System.IdentityModel.Selectors.dll
-%_prefix/lib/mono/gac/System.Runtime.Serialization
-%_prefix/lib/mono/2.0/System.Runtime.Serialization.dll
-%_prefix/lib/mono/gac/System.ServiceModel
-%_prefix/lib/mono/2.0/System.ServiceModel.dll
-%_prefix/lib/mono/gac/System.ServiceModel.Web
-%_prefix/lib/mono/2.0/System.ServiceModel.Web.dll
-%_prefix/lib/mono/2.0/svcutil.exe*
-%_libdir/pkgconfig/wcf.pc
-
-%package -n mono-winfxcore
-Summary: Mono implementation of core WinFX APIs
-Group: Development/Languages/Mono
-Requires: mono-core == %version-%release
-
-%description -n mono-winfxcore
-The Mono Project is an open development initiative that is working to
-develop an open source, Unix version of the .NET development platform.
-Its objective is to enable Unix developers to build and deploy
-cross-platform .NET applications. The project will implement various
-technologies that have been submitted to the ECMA for standardization.
-
-Mono implementation of core WinFX APIs
+Mono implementation of core WinFX APIs
 
 
 
@@ -582,11 +644,12 @@ Dietmar Maurer <dietmar@ximian.com>
 
 %files -n mono-winfxcore
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/WindowsBase
 %_prefix/lib/mono/2.0/WindowsBase.dll*
+%_prefix/lib/mono/4.0/WindowsBase.dll*
+%_prefix/lib/mono/gac/WindowsBase
 
 %package -n mono-web
-License:        X11/MIT; Ms-Pl
+License:        MIT License (or similar) ; Ms-Pl
 Summary:        Mono implementation of ASP.NET, Remoting and Web Services
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
@@ -616,65 +679,80 @@ Authors:
 
 %files -n mono-web
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/Mono.Http
-%_prefix/lib/mono/2.0/Mono.Http.dll
-%_prefix/lib/mono/gac/Mono.Web
-%_prefix/lib/mono/2.0/Mono.Web.dll
-%_prefix/lib/mono/gac/System.Runtime.Remoting
-%_prefix/lib/mono/2.0/System.Runtime.Remoting.dll
-%_prefix/lib/mono/gac/System.Web
-%_prefix/lib/mono/2.0/System.Web.dll
-%_prefix/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap
-%_prefix/lib/mono/2.0/System.Runtime.Serialization.Formatters.Soap.dll
-%_prefix/lib/mono/gac/System.Web.Services
-%_prefix/lib/mono/2.0/System.Web.Services.dll
-%_prefix/lib/mono/gac/System.Web.Abstractions
-%_prefix/lib/mono/2.0/System.Web.Abstractions.dll
-%_prefix/lib/mono/gac/System.Web.Routing
-%_prefix/lib/mono/2.0/System.Web.Routing.dll
-%_prefix/lib/mono/gac/System.Web.Extensions
-%_prefix/lib/mono/2.0/System.Web.Extensions.dll
-%_prefix/lib/mono/compat-2.0/System.Web.Extensions.dll
-%_prefix/lib/mono/gac/System.Web.Extensions.Design
-%_prefix/lib/mono/2.0/System.Web.Extensions.Design.dll
-%_prefix/lib/mono/3.5/System.Web.Extensions.Design.dll
-%_prefix/lib/mono/compat-2.0/System.Web.Extensions.Design.dll
-%_prefix/lib/mono/gac/System.Web.DynamicData
-%_prefix/lib/mono/2.0/System.Web.DynamicData.dll
-%_prefix/lib/mono/gac/System.ComponentModel.DataAnnotations
-%_prefix/lib/mono/2.0/System.ComponentModel.DataAnnotations.dll
-%_prefix/lib/mono/gac/System.Web.Mvc
-%_prefix/lib/mono/2.0/System.Web.Mvc.dll
-# pkg-config files
-%_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
-# exes
-%_prefix/lib/mono/2.0/disco.exe*
-%_prefix/lib/mono/2.0/soapsuds.exe*
-%_prefix/lib/mono/2.0/wsdl.exe*
-%_prefix/lib/mono/2.0/xsd.exe*
-%_prefix/lib/mono/2.0/mconfig.exe*
-# shell wrappers
+%config %_sysconfdir/mono/2.0/Browsers
+%config %_sysconfdir/mono/2.0/DefaultWsdlHelpGenerator.aspx
+%config %_sysconfdir/mono/2.0/web.config
+%config %_sysconfdir/mono/4.0/web.config
+%config %_sysconfdir/mono/browscap.ini
+%config %_sysconfdir/mono/mconfig/config.xml
+%dir %_sysconfdir/mono/mconfig
 %_bindir/disco
 %_bindir/mconfig
 %_bindir/soapsuds
 %_bindir/wsdl
 %_bindir/wsdl2
 %_bindir/xsd
-# man pages
+%_libdir/pkgconfig/mono.web.pc
+%_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
 %_mandir/man1/disco.1%ext_man
+%_mandir/man1/mconfig.1%ext_man
 %_mandir/man1/soapsuds.1%ext_man
 %_mandir/man1/wsdl.1%ext_man
 %_mandir/man1/xsd.1%ext_man
-%_mandir/man1/mconfig.1%ext_man
-%config %_sysconfdir/mono/browscap.ini
-%dir %_sysconfdir/mono/mconfig
-%config %_sysconfdir/mono/mconfig/config.xml
-%config %_sysconfdir/mono/2.0/DefaultWsdlHelpGenerator.aspx
-%config %_sysconfdir/mono/2.0/web.config
-%config %_sysconfdir/mono/2.0/Browsers
+%_prefix/lib/mono/2.0/Mono.Http.dll
+%_prefix/lib/mono/2.0/Mono.Web.dll
+%_prefix/lib/mono/2.0/System.ComponentModel.DataAnnotations.dll
+%_prefix/lib/mono/2.0/System.Runtime.Remoting.dll
+%_prefix/lib/mono/2.0/System.Runtime.Serialization.Formatters.Soap.dll
+%_prefix/lib/mono/2.0/System.Web.Abstractions.dll
+%_prefix/lib/mono/2.0/System.Web.DynamicData.dll
+%_prefix/lib/mono/2.0/System.Web.Extensions.Design.dll
+%_prefix/lib/mono/2.0/System.Web.Extensions.dll
+%_prefix/lib/mono/2.0/System.Web.Mvc.dll
+%_prefix/lib/mono/2.0/System.Web.Routing.dll
+%_prefix/lib/mono/2.0/System.Web.Services.dll
+%_prefix/lib/mono/2.0/System.Web.dll
+%_prefix/lib/mono/2.0/wsdl.exe*
+%_prefix/lib/mono/2.0/xsd.exe*
+%_prefix/lib/mono/3.5/System.Web.Extensions.Design.dll
+%_prefix/lib/mono/4.0/Mono.Http.dll
+%_prefix/lib/mono/4.0/Mono.Web.dll
+%_prefix/lib/mono/4.0/System.ComponentModel.Composition.dll
+%_prefix/lib/mono/4.0/System.ComponentModel.DataAnnotations.dll
+%_prefix/lib/mono/4.0/System.Runtime.Remoting.dll
+%_prefix/lib/mono/4.0/System.Runtime.Serialization.Formatters.Soap.dll
+%_prefix/lib/mono/4.0/System.Web.Abstractions.dll
+%_prefix/lib/mono/4.0/System.Web.DynamicData.dll
+%_prefix/lib/mono/4.0/System.Web.Extensions.Design.dll
+%_prefix/lib/mono/4.0/System.Web.Extensions.dll
+%_prefix/lib/mono/4.0/System.Web.Routing.dll
+%_prefix/lib/mono/4.0/System.Web.Services.dll
+%_prefix/lib/mono/4.0/System.Web.dll
+%_prefix/lib/mono/4.0/disco.exe*
+%_prefix/lib/mono/4.0/mconfig.exe*
+%_prefix/lib/mono/4.0/soapsuds.exe*
+%_prefix/lib/mono/4.0/wsdl.exe*
+%_prefix/lib/mono/4.0/xsd.exe*
+%_prefix/lib/mono/compat-2.0/System.Web.Extensions.Design.dll
+%_prefix/lib/mono/compat-2.0/System.Web.Extensions.dll
+%_prefix/lib/mono/compat-2.0/System.Web.Mvc.dll
+%_prefix/lib/mono/gac/Mono.Http
+%_prefix/lib/mono/gac/Mono.Web
+%_prefix/lib/mono/gac/System.ComponentModel.Composition
+%_prefix/lib/mono/gac/System.ComponentModel.DataAnnotations
+%_prefix/lib/mono/gac/System.Runtime.Remoting
+%_prefix/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap
+%_prefix/lib/mono/gac/System.Web
+%_prefix/lib/mono/gac/System.Web.Abstractions
+%_prefix/lib/mono/gac/System.Web.DynamicData
+%_prefix/lib/mono/gac/System.Web.Extensions
+%_prefix/lib/mono/gac/System.Web.Extensions.Design
+%_prefix/lib/mono/gac/System.Web.Mvc
+%_prefix/lib/mono/gac/System.Web.Routing
+%_prefix/lib/mono/gac/System.Web.Services
 
 %package -n mono-data-oracle
 License:        LGPL v2.1 only
@@ -702,8 +780,9 @@ Authors:
 
 %files -n mono-data-oracle
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/System.Data.OracleClient
 %_prefix/lib/mono/2.0/System.Data.OracleClient.dll
+%_prefix/lib/mono/4.0/System.Data.OracleClient.dll
+%_prefix/lib/mono/gac/System.Data.OracleClient
 
 %package -n mono-data-postgresql
 License:        LGPL v2.1 only
@@ -731,37 +810,9 @@ Authors:
 
 %files -n mono-data-postgresql
 %defattr(-, root, root)
-%_prefix/lib/mono/gac/Npgsql
 %_prefix/lib/mono/2.0/Npgsql.dll
-
-%package -n bytefx-data-mysql
-License:        LGPL v2.1 only
-Summary:        Database connectivity for Mono
-Group:          Development/Languages/Mono
-Requires:       mono-core == %version-%release
-Requires:       mono-data == %version-%release
-
-%description -n bytefx-data-mysql
-The Mono Project is an open development initiative that is working to
-develop an open source, Unix version of the .NET development platform.
-Its objective is to enable Unix developers to build and deploy
-cross-platform .NET applications. The project will implement various
-technologies that have been submitted to the ECMA for standardization.
-
-Database connectivity for Mono.
-
-
-
-Authors:
---------
-    Miguel de Icaza <miguel@ximian.com>
-    Paolo Molaro <lupus@ximian.com>
-    Dietmar Maurer <dietmar@ximian.com>
-
-%files -n bytefx-data-mysql
-%defattr(-, root, root)
-%_prefix/lib/mono/gac/ByteFX.Data
-%_prefix/lib/mono/2.0/ByteFX.Data.dll
+%_prefix/lib/mono/4.0/Npgsql.dll
+%_prefix/lib/mono/gac/Npgsql
 
 %package -n mono-nunit
 License:        LGPL v2.1 only
@@ -788,34 +839,42 @@ Authors:
 
 %files -n mono-nunit
 %defattr(-, root, root)
+%_libdir/pkgconfig/mono-nunit.pc
 %_prefix/bin/nunit-console
 %_prefix/bin/nunit-console2
+%_prefix/lib/mono/2.0/nunit-console-runner.dll
 %_prefix/lib/mono/2.0/nunit-console.exe*
-%_prefix/lib/mono/gac/nunit.util
-%_prefix/lib/mono/2.0/nunit.util.dll
-%_prefix/lib/mono/gac/nunit.core
 %_prefix/lib/mono/2.0/nunit.core.dll
-%_prefix/lib/mono/gac/nunit.core.extensions
 %_prefix/lib/mono/2.0/nunit.core.extensions.dll
-%_prefix/lib/mono/gac/nunit.core.interfaces
 %_prefix/lib/mono/2.0/nunit.core.interfaces.dll
-%_prefix/lib/mono/gac/nunit.framework
 %_prefix/lib/mono/2.0/nunit.framework.dll
-%_prefix/lib/mono/gac/nunit.framework.extensions
 %_prefix/lib/mono/2.0/nunit.framework.extensions.dll
-%_prefix/lib/mono/gac/nunit.mocks
 %_prefix/lib/mono/2.0/nunit.mocks.dll
+%_prefix/lib/mono/2.0/nunit.util.dll
+%_prefix/lib/mono/4.0/nunit-console-runner.dll
+%_prefix/lib/mono/4.0/nunit-console.exe*
+%_prefix/lib/mono/4.0/nunit.core.dll
+%_prefix/lib/mono/4.0/nunit.core.extensions.dll
+%_prefix/lib/mono/4.0/nunit.core.interfaces.dll
+%_prefix/lib/mono/4.0/nunit.framework.dll
+%_prefix/lib/mono/4.0/nunit.framework.extensions.dll
+%_prefix/lib/mono/4.0/nunit.mocks.dll
+%_prefix/lib/mono/4.0/nunit.util.dll
 %_prefix/lib/mono/gac/nunit-console-runner
-%_prefix/lib/mono/2.0/nunit-console-runner.dll
-
-%_libdir/pkgconfig/mono-nunit.pc
+%_prefix/lib/mono/gac/nunit.core
+%_prefix/lib/mono/gac/nunit.core.extensions
+%_prefix/lib/mono/gac/nunit.core.interfaces
+%_prefix/lib/mono/gac/nunit.framework
+%_prefix/lib/mono/gac/nunit.framework.extensions
+%_prefix/lib/mono/gac/nunit.mocks
+%_prefix/lib/mono/gac/nunit.util
 
 %package -n mono-devel
 License:        LGPL v2.1 only
 Summary:        Mono development tools
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
-Requires:       glib2-devel
+Requires:       pkgconfig
 %if 0%{?monobuild}
 Requires:       libgdiplus0
 %else
@@ -850,91 +909,33 @@ Authors:
 
 %files -n mono-devel
 %defattr(-, root, root)
-# libs
-%_libdir/libmono.so
-%_libdir/libmono.a
-# exes
-%_prefix/lib/mono/2.0/mono-api-info.exe*
-%_prefix/lib/mono/2.0/al.exe*
-%_prefix/lib/mono/2.0/mono-cil-strip.exe*
-%_prefix/lib/mono/2.0/dtd2xsd.exe*
-%_prefix/lib/mono/2.0/genxs.exe*
-%_prefix/lib/mono/2.0/ictool.exe*
-%_prefix/lib/mono/2.0/ilasm.exe*
-%_prefix/lib/mono/2.0/installvst.exe*
-%_prefix/lib/mono/2.0/lc.exe*
-%_prefix/lib/mono/2.0/mkbundle.exe*
-%_prefix/lib/mono/2.0/monop.exe*
-%_prefix/lib/mono/2.0/resgen.exe*
-%_prefix/lib/mono/2.0/sgen.exe*
-%_prefix/lib/mono/2.0/prj2make.exe*
-%_prefix/lib/mono/2.0/macpack.exe*
-%_prefix/lib/mono/2.0/mono-shlib-cop.exe*
-%_prefix/lib/mono/2.0/dtd2rng.exe*
-%_prefix/lib/mono/2.0/mono-xmltool.exe*
-%_prefix/lib/mono/2.0/pdb2mdb.exe*
-# xbuild related files
-%_prefix/lib/mono/2.0/xbuild.exe*
-%_prefix/lib/mono/2.0/Microsoft.Build.xsd
-%_prefix/lib/mono/2.0/Microsoft.Common.tasks
-%_prefix/lib/mono/2.0/Microsoft.Common.targets
-%_prefix/lib/mono/2.0/Microsoft.CSharp.targets
-%_prefix/lib/mono/2.0/Microsoft.VisualBasic.targets
-%_prefix/lib/mono/2.0/MSBuild
-%_prefix/lib/mono/2.0/xbuild.rsp
-%_prefix/lib/mono/xbuild
-# man pages
-%_mandir/man1/cert2spc.1%ext_man
-%_mandir/man1/mono-cil-strip.1%ext_man
-%_mandir/man1/dtd2xsd.1%ext_man
-%_mandir/man1/genxs.1%ext_man
-%_mandir/man1/httpcfg.1%ext_man
-%_mandir/man1/ilasm.1%ext_man
-%_mandir/man1/lc.1%ext_man
-%_mandir/man1/macpack.1%ext_man
-%_mandir/man1/makecert.1%ext_man
-%_mandir/man1/mkbundle.1%ext_man
-%_mandir/man1/monodis.1%ext_man
-%_mandir/man1/monop.1%ext_man
-%_mandir/man1/mono-shlib-cop.1%ext_man
-%_mandir/man1/permview.1%ext_man
-%_mandir/man1/pdb2mdb.1%ext_man
-%_mandir/man1/prj2make.1%ext_man
-%_mandir/man1/secutil.1%ext_man
-%_mandir/man1/sgen.1%ext_man
-%_mandir/man1/signcode.1%ext_man
-%_mandir/man1/al.1%ext_man
-%_mandir/man1/mono-xmltool.1%ext_man
-%_mandir/man1/resgen.1%ext_man
-%_mandir/man1/xbuild.1%ext_man
-# Shell wrappers
 %_bindir/al
 %_bindir/al2
 %_bindir/caspol
 %_bindir/cert2spc
-%_bindir/dtd2xsd
 %_bindir/dtd2rng
+%_bindir/dtd2xsd
 %_bindir/genxs
 %_bindir/httpcfg
 %_bindir/ilasm
-%_bindir/ilasm2
 %_bindir/installvst
 %_bindir/lc
 %_bindir/macpack
 %_bindir/makecert
 %_bindir/mkbundle
-%_bindir/mkbundle2
-%_bindir/mono-gdb.py
-%_bindir/monodis
-%_bindir/monolinker
-%_bindir/monop
-%_bindir/monop2
 %_bindir/mono-api-info
 %_bindir/mono-cil-strip
 %_bindir/mono-find-provides
 %_bindir/mono-find-requires
+%_bindir/mono-gdb.py
+%_bindir/mono-heapviz
 %_bindir/mono-shlib-cop
 %_bindir/mono-xmltool
+%_bindir/monodis
+%_bindir/monograph
+%_bindir/monolinker
+%_bindir/monop
+%_bindir/monop2
 %_bindir/pdb2mdb
 %_bindir/pedump
 %_bindir/permview
@@ -945,52 +946,134 @@ Authors:
 %_bindir/sgen
 %_bindir/signcode
 %_bindir/xbuild
-%_mandir/man1/monolinker.1%ext_man
-%_prefix/lib/mono/gac/PEAPI
-%_prefix/lib/mono/2.0/monolinker.*
-%_prefix/lib/mono/2.0/PEAPI.dll
-%_prefix/lib/mono/gac/Mono.Debugger.Soft
-%_prefix/lib/mono/2.0/Mono.Debugger.Soft.dll
-%_prefix/lib/mono/gac/Microsoft.Build.Tasks
-%_prefix/lib/mono/2.0/Microsoft.Build.Tasks.dll
-%_prefix/lib/mono/gac/Microsoft.Build.Tasks.v3.5
-%_prefix/lib/mono/3.5/Microsoft.Build.Tasks.v3.5.dll
-%_prefix/lib/mono/gac/Microsoft.Build.Framework
-%_prefix/lib/mono/2.0/Microsoft.Build.Framework.dll
-%_prefix/lib/mono/3.5/Microsoft.Build.Framework.dll
-%_prefix/lib/mono/gac/Microsoft.Build.Utilities
-%_prefix/lib/mono/2.0/Microsoft.Build.Utilities.dll
-%_prefix/lib/mono/gac/Microsoft.Build.Utilities.v3.5
-%_prefix/lib/mono/3.5/Microsoft.Build.Utilities.v3.5.dll
-%_prefix/lib/mono/gac/Microsoft.Build.Engine
-%_prefix/lib/mono/2.0/Microsoft.Build.Engine.dll
-%_prefix/lib/mono/3.5/Microsoft.Build.Engine.dll
-%_prefix/lib/mono-source-libs
-%_bindir/monograph
-%_prefix/include/mono-1.0
-%_libdir/libmono-profiler-cov.*
 %_libdir/libmono-profiler-aot.*
+%_libdir/libmono-profiler-cov.*
+%_libdir/libmono-profiler-iomap.*
 %_libdir/libmono-profiler-logging.*
-%_libdir/pkgconfig/mono.pc
+%_libdir/pkgconfig/cecil.pc
 %_libdir/pkgconfig/dotnet.pc
 %_libdir/pkgconfig/dotnet35.pc
 %_libdir/pkgconfig/mono-cairo.pc
-%_libdir/pkgconfig/mono-options.pc
 %_libdir/pkgconfig/mono-lineeditor.pc
-%_libdir/pkgconfig/cecil.pc
-%_prefix/share/mono-1.0/mono/cil/cil-opcodes.xml
-# dirs
-%dir %_prefix/share/mono-1.0
-%dir %_prefix/share/mono-1.0/mono
-%dir %_prefix/share/mono-1.0/mono/cil
-# Reminder: when removing man pages in this list, they are not 
-#  yet gzipped
+%_libdir/pkgconfig/mono-options.pc
+%_libdir/pkgconfig/mono.pc
+%_mandir/man1/al.1%ext_man
+%_mandir/man1/cert2spc.1%ext_man
+%_mandir/man1/dtd2xsd.1%ext_man
+%_mandir/man1/genxs.1%ext_man
+%_mandir/man1/httpcfg.1%ext_man
+%_mandir/man1/ilasm.1%ext_man
+%_mandir/man1/lc.1%ext_man
+%_mandir/man1/macpack.1%ext_man
+%_mandir/man1/makecert.1%ext_man
+%_mandir/man1/mkbundle.1%ext_man
+%_mandir/man1/mono-cil-strip.1%ext_man
+%_mandir/man1/mono-shlib-cop.1%ext_man
+%_mandir/man1/mono-xmltool.1%ext_man
+%_mandir/man1/monodis.1%ext_man
+%_mandir/man1/monolinker.1%ext_man
+%_mandir/man1/monop.1%ext_man
+%_mandir/man1/pdb2mdb.1%ext_man
+%_mandir/man1/permview.1%ext_man
+%_mandir/man1/prj2make.1%ext_man
+%_mandir/man1/resgen.1%ext_man
+%_mandir/man1/secutil.1%ext_man
+%_mandir/man1/sgen.1%ext_man
+%_mandir/man1/signcode.1%ext_man
+%_mandir/man1/xbuild.1%ext_man
+%_prefix/lib/mono-source-libs
+%_prefix/lib/mono/2.0/MSBuild
+%_prefix/lib/mono/2.0/Microsoft.Build.Engine.dll
+%_prefix/lib/mono/2.0/Microsoft.Build.Framework.dll
+%_prefix/lib/mono/2.0/Microsoft.Build.Tasks.dll
+%_prefix/lib/mono/2.0/Microsoft.Build.Utilities.dll
+%_prefix/lib/mono/2.0/Microsoft.Build.xsd
+%_prefix/lib/mono/2.0/Microsoft.CSharp.targets
+%_prefix/lib/mono/2.0/Microsoft.Common.targets
+%_prefix/lib/mono/2.0/Microsoft.Common.tasks
+%_prefix/lib/mono/2.0/Microsoft.VisualBasic.targets
+%_prefix/lib/mono/2.0/Mono.Debugger.Soft.dll
+%_prefix/lib/mono/2.0/PEAPI.dll
+%_prefix/lib/mono/2.0/al.exe*
+%_prefix/lib/mono/2.0/genxs.exe*
+%_prefix/lib/mono/2.0/ilasm.exe*
+%_prefix/lib/mono/2.0/mkbundle.exe*
+%_prefix/lib/mono/2.0/monolinker.*
+%_prefix/lib/mono/2.0/monop.exe*
+%_prefix/lib/mono/2.0/resgen.exe*
+%_prefix/lib/mono/2.0/xbuild.exe*
+%_prefix/lib/mono/2.0/xbuild.rsp
+%_prefix/lib/mono/3.5/MSBuild
+%_prefix/lib/mono/3.5/Microsoft.Build.Engine.dll
+%_prefix/lib/mono/3.5/Microsoft.Build.Framework.dll
+%_prefix/lib/mono/3.5/Microsoft.Build.Tasks.v3.5.dll
+%_prefix/lib/mono/3.5/Microsoft.Build.Utilities.v3.5.dll
+%_prefix/lib/mono/3.5/Microsoft.Build.xsd
+%_prefix/lib/mono/3.5/Microsoft.CSharp.targets
+%_prefix/lib/mono/3.5/Microsoft.Common.targets
+%_prefix/lib/mono/3.5/Microsoft.Common.tasks
+%_prefix/lib/mono/3.5/Microsoft.VisualBasic.targets
+%_prefix/lib/mono/3.5/xbuild.exe*
+%_prefix/lib/mono/3.5/xbuild.rsp
+%_prefix/lib/mono/4.0/MSBuild
+%_prefix/lib/mono/4.0/Microsoft.Build.Engine.dll
+%_prefix/lib/mono/4.0/Microsoft.Build.Framework.dll
+%_prefix/lib/mono/4.0/Microsoft.Build.Tasks.v4.0.dll
+%_prefix/lib/mono/4.0/Microsoft.Build.Utilities.v4.0.dll
+%_prefix/lib/mono/4.0/Microsoft.Build.xsd
+%_prefix/lib/mono/4.0/Microsoft.CSharp.targets
+%_prefix/lib/mono/4.0/Microsoft.Common.targets
+%_prefix/lib/mono/4.0/Microsoft.Common.tasks
+%_prefix/lib/mono/4.0/Microsoft.VisualBasic.targets
+%_prefix/lib/mono/4.0/PEAPI.dll
+%_prefix/lib/mono/4.0/al.exe*
+%_prefix/lib/mono/4.0/caspol.exe*
+%_prefix/lib/mono/4.0/cert2spc.exe*
+%_prefix/lib/mono/4.0/dtd2rng.exe*
+%_prefix/lib/mono/4.0/dtd2xsd.exe*
+%_prefix/lib/mono/4.0/genxs.exe*
+%_prefix/lib/mono/4.0/httpcfg.exe*
+%_prefix/lib/mono/4.0/ictool.exe*
+%_prefix/lib/mono/4.0/ilasm.exe*
+%_prefix/lib/mono/4.0/installvst.exe*
+%_prefix/lib/mono/4.0/lc.exe*
+%_prefix/lib/mono/4.0/macpack.exe*
+%_prefix/lib/mono/4.0/makecert.exe*
+%_prefix/lib/mono/4.0/mkbundle.exe*
+%_prefix/lib/mono/4.0/mono-api-info.exe*
+%_prefix/lib/mono/4.0/mono-cil-strip.exe*
+%_prefix/lib/mono/4.0/mono-shlib-cop.exe*
+%_prefix/lib/mono/4.0/mono-xmltool.exe*
+%_prefix/lib/mono/4.0/monolinker.*
+%_prefix/lib/mono/4.0/monop.exe*
+%_prefix/lib/mono/4.0/pdb2mdb.exe*
+%_prefix/lib/mono/4.0/permview.exe*
+%_prefix/lib/mono/4.0/resgen.exe*
+%_prefix/lib/mono/4.0/secutil.exe*
+%_prefix/lib/mono/4.0/sgen.exe*
+%_prefix/lib/mono/4.0/signcode.exe*
+%_prefix/lib/mono/4.0/xbuild.exe*
+%_prefix/lib/mono/4.0/xbuild.rsp
+%_prefix/lib/mono/gac/Microsoft.Build.Engine
+%_prefix/lib/mono/gac/Microsoft.Build.Framework
+%_prefix/lib/mono/gac/Microsoft.Build.Tasks
+%_prefix/lib/mono/gac/Microsoft.Build.Tasks.v3.5
+%_prefix/lib/mono/gac/Microsoft.Build.Tasks.v4.0
+%_prefix/lib/mono/gac/Microsoft.Build.Utilities
+%_prefix/lib/mono/gac/Microsoft.Build.Utilities.v3.5
+%_prefix/lib/mono/gac/Microsoft.Build.Utilities.v4.0
+%_prefix/lib/mono/gac/Mono.Debugger.Soft
+%_prefix/lib/mono/gac/PEAPI
+%_prefix/lib/mono/xbuild
+%_prefix/share/mono-2.0/mono/cil/cil-opcodes.xml
+%dir %_prefix/share/mono-2.0
+%dir %_prefix/share/mono-2.0/mono
+%dir %_prefix/share/mono-2.0/mono/cil
 
 %package -n monodoc-core
-License:        GNU General Public License (GPL)
-Summary:        Monodoc-Documentation tools for C# code
+License:        LGPL v2.1 only
+Summary:        Monodoc - Documentation tools for C# code
 Group:          Development/Tools/Other
-URL:            http://go-mono.org/
 Provides:       monodoc
 Obsoletes:      monodoc
 
@@ -999,10 +1082,6 @@ Monodoc-core contains documentation tools for C#.
 
 %files -n monodoc-core
 %defattr(-, root, root)
-%{_prefix}/lib/mono/2.0/mdoc.exe*
-%{_prefix}/lib/mono/2.0/mod.exe*
-%{_prefix}/lib/mono/gac/monodoc
-%{_prefix}/lib/mono/monodoc
 %{_bindir}/mdassembler
 %{_bindir}/mdoc
 %{_bindir}/mdoc-assemble
@@ -1015,7 +1094,6 @@ Monodoc-core contains documentation tools for C#.
 %{_bindir}/monodocer
 %{_bindir}/monodocs2html
 %{_bindir}/monodocs2slashdoc
-%{_prefix}/lib/monodoc
 %{_libdir}/pkgconfig/monodoc.pc
 %{_mandir}/man1/mdassembler.1%ext_man
 %{_mandir}/man1/mdoc-assemble.1%ext_man
@@ -1028,6 +1106,11 @@ Monodoc-core contains documentation tools for C#.
 %{_mandir}/man1/monodocer.1%ext_man
 %{_mandir}/man1/monodocs2html.1%ext_man
 %{_mandir}/man5/mdoc.5%ext_man
+%{_prefix}/lib/mono/4.0/mdoc.exe*
+%{_prefix}/lib/mono/4.0/mod.exe*
+%{_prefix}/lib/mono/gac/monodoc
+%{_prefix}/lib/mono/monodoc
+%{_prefix}/lib/monodoc
 
 %package -n mono-complete
 License:        LGPL v2.1 only
@@ -1047,8 +1130,8 @@ Requires:       mono-extras = %version-%release
 Requires:       mono-jscript = %version-%release
 Requires:       mono-locale-extras = %version-%release
 Requires:       mono-nunit = %version-%release
-Requires:       mono-web = %version-%release
 Requires:       mono-wcf = %version-%release
+Requires:       mono-web = %version-%release
 Requires:       mono-winforms = %version-%release
 
 %description -n mono-complete
@@ -1068,9 +1151,8 @@ Authors:
 
 %files -n mono-complete
 %defattr(-, root, root)
-# Directories
-# Put dir files here so we don't have an empty package
 %dir %_prefix/lib/mono/compat-2.0
+%dir %_prefix/lib/mono/compat-4.0
 
 %prep
 %setup -q -n mono-%{version}
@@ -1102,11 +1184,11 @@ rm -f %buildroot%_libdir/libikvm-native.a
 # remove libgc cruft
 rm -rf %buildroot%_datadir/libgc-mono
 # remove stuff that we don't package
-rm -f %buildroot%_prefix/lib/mono/2.0/browsercaps-updater.exe*
+rm -f %buildroot%_prefix/lib/mono/*/browsercaps-updater.exe*
 rm -f %buildroot%_bindir/cilc
 rm -f %buildroot%_mandir/man1/cilc.1*
 rm -f %buildroot%_prefix/lib/mono/2.0/cilc.exe*
-rm -f %buildroot%_prefix/lib/mono/2.0/culevel.exe*
+rm -f %buildroot%_prefix/lib/mono/*/culevel.exe*
 # brp-compress doesn't search _mandir
 # so we cheat it
 ln -s . %buildroot%_prefix/usr