X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono-core.spec.in;h=ab9374a3554284017e1677cf9a72729221ad53a7;hb=17a5acf73020b71c9fd0602eab3a26ce01216d41;hp=c846f7862cdbadec036810645353fa04182f69f6;hpb=d1ef303ddd42e056519710342b2cda1a072f4ac0;p=mono.git

diff --git a/mono-core.spec.in b/mono-core.spec.in
index c846f7862cd..ab9374a3554 100644
--- a/mono-core.spec.in
+++ b/mono-core.spec.in
@@ -16,9 +16,10 @@ Version:        @VERSION@
 Release:        0
 Source0:        mono-%{version}.tar.bz2
 BuildRequires:  bison
-BuildRequires:  gcc-c++
 BuildRequires:  fdupes
+BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
+BuildRequires:  xorg-x11-libX11-devel
 BuildRequires:  zlib-devel
 %ifnarch ia64
 BuildRequires:  valgrind-devel
@@ -96,6 +97,9 @@ export PATH=/opt/novell/llvm-mono/bin:$PATH
 %if %llvm == yes
   --enable-loadedllvm \
   --disable-system-aot \
+%endif
+%ifnarch %ix86 x86_64
+  --disable-system-aot \
 %endif
   --with-ikvm=yes \
   --with-moonlight=no
@@ -144,7 +148,6 @@ rm -rf %buildroot
 %dir %_prefix/lib/mono/3.5
 %dir %_prefix/lib/mono/4.0
 %dir %_prefix/lib/mono/compat-2.0
-%dir %_prefix/lib/mono/compat-4.0
 %dir %_prefix/lib/mono/gac
 %dir %_sysconfdir/mono
 %dir %_sysconfdir/mono/2.0
@@ -153,8 +156,8 @@ rm -rf %buildroot
 %_bindir/al2
 %_bindir/certmgr
 %_bindir/chktrust
+%_bindir/crlupdate
 %_bindir/csharp
-%_bindir/csharp2
 %_bindir/dmcs
 %_bindir/gacutil
 %_bindir/gacutil2
@@ -174,6 +177,7 @@ rm -rf %buildroot
 %_libdir/libikvm-native.so
 %_mandir/man1/certmgr.1%ext_man
 %_mandir/man1/chktrust.1%ext_man
+%_mandir/man1/crlupdate.1%ext_man
 %_mandir/man1/csharp.1%ext_man
 %_mandir/man1/gacutil.1%ext_man
 %_mandir/man1/mcs.1%ext_man
@@ -209,9 +213,7 @@ rm -rf %buildroot
 %_prefix/lib/mono/2.0/System.dll
 %_prefix/lib/mono/2.0/al.exe*
 %_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*
 %_prefix/lib/mono/4.0/Commons.Xml.Relaxng.dll
 %_prefix/lib/mono/4.0/CustomMarshalers.dll
@@ -225,6 +227,7 @@ rm -rf %buildroot
 %_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.Parallel.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
@@ -243,16 +246,16 @@ rm -rf %buildroot
 %_prefix/lib/mono/4.0/al.exe*
 %_prefix/lib/mono/4.0/certmgr.exe*
 %_prefix/lib/mono/4.0/chktrust.exe*
+%_prefix/lib/mono/4.0/crlupdate.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/mcs.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/compat-4.0/ICSharpCode.SharpZipLib.dll
 %_prefix/lib/mono/gac/Commons.Xml.Relaxng
 %_prefix/lib/mono/gac/CustomMarshalers
 %_prefix/lib/mono/gac/I18N
@@ -267,6 +270,7 @@ rm -rf %buildroot
 %_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.Parallel
 %_prefix/lib/mono/gac/Mono.Posix
 %_prefix/lib/mono/gac/Mono.Security
 %_prefix/lib/mono/gac/Mono.Simd
@@ -324,6 +328,7 @@ Development files for libmono.
 
 %files -n libmono-2_0-devel
 %defattr(-, root, root)
+%_bindir/mono-gdb.py
 %_includedir/mono-2.0
 %_libdir/libmono-2.0.a
 %_libdir/libmono-2.0.so
@@ -357,6 +362,7 @@ License:        LGPL v2.1 only
 Summary:	Development files for libmonosgen
 Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
+Requires:       libmono-2_0-devel
 
 %description -n libmonosgen-2_0-devel
 The Mono Project is an open development initiative that is working to
@@ -369,8 +375,10 @@ Development files for libmonosgen.
 
 %files -n libmonosgen-2_0-devel
 %defattr(-, root, root)
+%_bindir/mono-sgen-gdb.py
 %_libdir/libmonosgen-2.0.a
 %_libdir/libmonosgen-2.0.so
+%_libdir/pkgconfig/monosgen-2.pc
 %endif
 
 %if %llvm == yes
@@ -480,6 +488,7 @@ Database connectivity for Mono.
 %_prefix/lib/mono/4.0/System.EnterpriseServices.dll
 %_prefix/lib/mono/4.0/System.Runtime.Serialization.dll
 %_prefix/lib/mono/4.0/System.Transactions.dll
+%_prefix/lib/mono/4.0/WebMatrix.Data.dll
 %_prefix/lib/mono/4.0/sqlmetal.exe*
 %_prefix/lib/mono/4.0/sqlsharp.exe*
 %_prefix/lib/mono/gac/Mono.Data.Tds
@@ -491,6 +500,7 @@ Database connectivity for Mono.
 %_prefix/lib/mono/gac/System.EnterpriseServices
 %_prefix/lib/mono/gac/System.Runtime.Serialization
 %_prefix/lib/mono/gac/System.Transactions
+%_prefix/lib/mono/gac/WebMatrix.Data
 
 %package -n mono-winforms
 License:        LGPL v2.1 only
@@ -699,7 +709,9 @@ Mono implementation of core WinFX APIs
 
 %files -n mono-winfxcore
 %defattr(-, root, root)
+%_prefix/lib/mono/2.0/System.Data.Services.Client.dll*
 %_prefix/lib/mono/2.0/WindowsBase.dll*
+%_prefix/lib/mono/4.0/System.Data.Services.Client.dll*
 %_prefix/lib/mono/4.0/WindowsBase.dll*
 %_prefix/lib/mono/gac/System.Data.Services.Client
 %_prefix/lib/mono/gac/WindowsBase
@@ -758,12 +770,12 @@ Mono implementation of ASP.NET, Remoting and Web Services.
 %_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.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/4.0/Microsoft.Web.Infrastructure.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
@@ -772,7 +784,6 @@ Mono implementation of ASP.NET, Remoting and Web Services.
 %_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.ApplicationServices.dll
-%_prefix/lib/mono/4.0/System.Web.DynamicData.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
@@ -781,6 +792,7 @@ Mono implementation of ASP.NET, Remoting and Web Services.
 %_prefix/lib/mono/4.0/soapsuds.exe*
 %_prefix/lib/mono/4.0/wsdl.exe*
 %_prefix/lib/mono/4.0/xsd.exe*
+%_prefix/lib/mono/gac/Microsoft.Web.Infrastructure
 %_prefix/lib/mono/gac/Mono.Http
 %_prefix/lib/mono/gac/Mono.Web
 %_prefix/lib/mono/gac/System.ComponentModel.Composition
@@ -790,7 +802,6 @@ Mono implementation of ASP.NET, Remoting and Web Services.
 %_prefix/lib/mono/gac/System.Web
 %_prefix/lib/mono/gac/System.Web.Abstractions
 %_prefix/lib/mono/gac/System.Web.ApplicationServices
-%_prefix/lib/mono/gac/System.Web.DynamicData
 %_prefix/lib/mono/gac/System.Web.Routing
 %_prefix/lib/mono/gac/System.Web.Services
 
@@ -815,15 +826,17 @@ Mono implementation of ASP.NET MVC.
 %_libdir/pkgconfig/system.web.extensions_1.0.pc
 %_libdir/pkgconfig/system.web.mvc.pc
 %_libdir/pkgconfig/system.web.mvc2.pc
+%_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/3.5/System.Web.Extensions.Design.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/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/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
@@ -975,7 +988,6 @@ Mono development tools.
 %_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
@@ -984,6 +996,7 @@ Mono development tools.
 %_bindir/monolinker
 %_bindir/monop
 %_bindir/monop2
+%_bindir/mprof-report
 %_bindir/pdb2mdb
 %_bindir/pedump
 %_bindir/permview
@@ -998,10 +1011,7 @@ Mono development tools.
 %dir %_datadir/mono-2.0/mono
 %dir %_datadir/mono-2.0/mono/cil
 %_datadir/mono-2.0/mono/cil/cil-opcodes.xml
-%_libdir/libmono-profiler-aot.*
-%_libdir/libmono-profiler-cov.*
-%_libdir/libmono-profiler-iomap.*
-%_libdir/libmono-profiler-logging.*
+%_libdir/libmono-profiler-*.*
 %_libdir/pkgconfig/cecil.pc
 %_libdir/pkgconfig/dotnet.pc
 %_libdir/pkgconfig/dotnet35.pc
@@ -1027,6 +1037,7 @@ Mono development tools.
 %_mandir/man1/monodis.1%ext_man
 %_mandir/man1/monolinker.1%ext_man
 %_mandir/man1/monop.1%ext_man
+%_mandir/man1/mprof-report.1%ext_man
 %_mandir/man1/pdb2mdb.1%ext_man
 %_mandir/man1/permview.1%ext_man
 %_mandir/man1/prj2make.1%ext_man
@@ -1078,6 +1089,7 @@ Mono development tools.
 %_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/Mono.Debugger.Soft.dll
 %_prefix/lib/mono/4.0/Mono.CodeContracts.dll
 %_prefix/lib/mono/4.0/PEAPI.dll
 %_prefix/lib/mono/4.0/caspol.exe*
@@ -1120,6 +1132,7 @@ Mono development tools.
 %_prefix/lib/mono/gac/Mono.Debugger.Soft
 %_prefix/lib/mono/gac/PEAPI
 %_prefix/lib/mono/xbuild
+%_prefix/lib/mono/xbuild-frameworks
 
 %package -n monodoc-core
 License:        LGPL v2.1 only
@@ -1208,6 +1221,5 @@ not install anything from outside the mono source (XSP, mono-basic, etc.).
 %files -n mono-complete
 %defattr(-, root, root)
 %dir %_prefix/lib/mono/compat-2.0
-%dir %_prefix/lib/mono/compat-4.0
 
 %changelog