From e14129134f2b18675f771c9fba2f1be78991d0d5 Mon Sep 17 00:00:00 2001 From: Andrew Jorgensen Date: Thu, 16 Sep 2010 17:12:12 -0600 Subject: [PATCH] More .spec reorgs --- mono-core.spec.in | 97 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 37 deletions(-) diff --git a/mono-core.spec.in b/mono-core.spec.in index 2e3658757b0..c846f7862cd 100644 --- a/mono-core.spec.in +++ b/mono-core.spec.in @@ -7,20 +7,17 @@ %define sgen no %endif -%if %llvm == yes -%define enable_llvm --enable-loadedllvm -%endif - Name: mono-core License: LGPL v2.1 only Group: Development/Languages/Mono Summary: A .NET Runtime Environment Url: http://www.mono-project.com Version: @VERSION@ -Release: 30 +Release: 0 Source0: mono-%{version}.tar.bz2 BuildRequires: bison BuildRequires: gcc-c++ +BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: zlib-devel %ifnarch ia64 @@ -95,9 +92,12 @@ export CFLAGS=" $RPM_OPT_FLAGS -fno-strict-aliasing" export PATH=/opt/novell/llvm-mono/bin:$PATH %endif %configure \ - --with-ikvm=yes \ --with-sgen=%{sgen} \ - %{?enable_llvm} \ +%if %llvm == yes + --enable-loadedllvm \ + --disable-system-aot \ +%endif + --with-ikvm=yes \ --with-moonlight=no make # We are not -jN safe! %{?jobs:-j%jobs} @@ -122,9 +122,10 @@ rm -f %buildroot%_prefix/lib/mono/*/culevel.exe* rm -f %buildroot%_prefix/lib/mono/2.0/cilc.exe* # brp-compress doesn't search _mandir # so we cheat it -ln -s . %buildroot%_prefix/usr +ln -s . %buildroot%_prefix%_prefix RPM_BUILD_ROOT=%buildroot%_prefix /usr/lib/rpm/brp-compress -rm %buildroot%_prefix/usr +rm %buildroot%_prefix%_prefix +%fdupes %buildroot%_prefix %find_lang mcs %clean @@ -148,6 +149,8 @@ rm -rf %buildroot %dir %_sysconfdir/mono %dir %_sysconfdir/mono/2.0 %dir %_sysconfdir/mono/4.0 +%_bindir/al +%_bindir/al2 %_bindir/certmgr %_bindir/chktrust %_bindir/csharp @@ -204,6 +207,7 @@ rm -rf %buildroot %_prefix/lib/mono/2.0/System.Xml.Linq.dll %_prefix/lib/mono/2.0/System.Xml.dll %_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* @@ -236,6 +240,7 @@ rm -rf %buildroot %_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/al.exe* %_prefix/lib/mono/4.0/certmgr.exe* %_prefix/lib/mono/4.0/chktrust.exe* %_prefix/lib/mono/4.0/cscompmgd.dll @@ -306,6 +311,7 @@ A Library for embedding Mono in your Application. License: LGPL v2.1 only Summary: Development files for libmono Group: Development/Languages/Mono +Requires: mono-core == %version-%release %description -n libmono-2_0-devel The Mono Project is an open development initiative that is working to @@ -350,6 +356,7 @@ A Library for embedding Mono in your Application (sgen version). License: LGPL v2.1 only Summary: Development files for libmonosgen Group: Development/Languages/Mono +Requires: mono-core == %version-%release %description -n libmonosgen-2_0-devel The Mono Project is an open development initiative that is working to @@ -459,19 +466,19 @@ Database connectivity for Mono. %_prefix/lib/mono/2.0/Novell.Directory.Ldap.dll %_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.Services.dll %_prefix/lib/mono/2.0/System.Data.dll %_prefix/lib/mono/2.0/System.DirectoryServices.dll %_prefix/lib/mono/2.0/System.EnterpriseServices.dll +%_prefix/lib/mono/2.0/System.Runtime.Serialization.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.Services.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.Runtime.Serialization.dll %_prefix/lib/mono/4.0/System.Transactions.dll %_prefix/lib/mono/4.0/sqlmetal.exe* %_prefix/lib/mono/4.0/sqlsharp.exe* @@ -480,9 +487,9 @@ Database connectivity for Mono. %_prefix/lib/mono/gac/System.Data %_prefix/lib/mono/gac/System.Data.DataSetExtensions %_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.Runtime.Serialization %_prefix/lib/mono/gac/System.Transactions %package -n mono-winforms @@ -652,31 +659,28 @@ Mono implementation of WCF, Windows Communication Foundation %defattr(-, root, root) %_bindir/svcutil %_libdir/pkgconfig/wcf.pc +%_prefix/lib/mono/2.0/System.Data.Services.dll %_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.Data.Services.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.DurableInstancing.dll -%_prefix/lib/mono/4.0/System.Runtime.Serialization.dll %_prefix/lib/mono/4.0/System.ServiceModel.Discovery.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.Data.Services %_prefix/lib/mono/gac/System.IdentityModel %_prefix/lib/mono/gac/System.IdentityModel.Selectors %_prefix/lib/mono/gac/System.Runtime.DurableInstancing -%_prefix/lib/mono/gac/System.Runtime.Serialization %_prefix/lib/mono/gac/System.ServiceModel %_prefix/lib/mono/gac/System.ServiceModel.Discovery %_prefix/lib/mono/gac/System.ServiceModel.Routing %_prefix/lib/mono/gac/System.ServiceModel.Web -%_prefix/lib/mono/gac/System.Web.ApplicationServices %package -n mono-winfxcore License: MIT License (or similar) ; Ms-Pl @@ -697,6 +701,7 @@ Mono implementation of core WinFX APIs %defattr(-, root, root) %_prefix/lib/mono/2.0/WindowsBase.dll* %_prefix/lib/mono/4.0/WindowsBase.dll* +%_prefix/lib/mono/gac/System.Data.Services.Client %_prefix/lib/mono/gac/WindowsBase %package -n mono-web @@ -742,10 +747,6 @@ Mono implementation of ASP.NET, Remoting and Web Services. %_bindir/wsdl2 %_bindir/xsd %_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 @@ -758,9 +759,6 @@ Mono implementation of ASP.NET, Remoting and Web Services. %_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 @@ -773,9 +771,8 @@ Mono implementation of ASP.NET, Remoting and Web Services. %_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.ApplicationServices.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 @@ -784,9 +781,6 @@ 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/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 @@ -795,12 +789,44 @@ Mono implementation of ASP.NET, Remoting and Web Services. %_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.ApplicationServices %_prefix/lib/mono/gac/System.Web.DynamicData +%_prefix/lib/mono/gac/System.Web.Routing +%_prefix/lib/mono/gac/System.Web.Services + +%package -n mono-mvc +License: MIT License (or similar) ; Ms-Pl +Summary: Mono implementation of ASP.NET MVC +Group: Development/Languages/Mono +Requires: mono-core == %version-%release + +%description -n mono-mvc +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 ASP.NET MVC. + +%files -n mono-mvc +%defattr(-, root, root) +%_libdir/pkgconfig/system.web.extensions.design_1.0.pc +%_libdir/pkgconfig/system.web.extensions_1.0.pc +%_libdir/pkgconfig/system.web.mvc.pc +%_libdir/pkgconfig/system.web.mvc2.pc +%_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.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.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 @@ -932,8 +958,6 @@ Mono development tools. %files -n mono-devel %defattr(-, root, root) -%_bindir/al -%_bindir/al2 %_bindir/caspol %_bindir/ccrewrite %_bindir/cert2spc @@ -1024,7 +1048,6 @@ Mono development tools. %_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* @@ -1057,7 +1080,6 @@ Mono development tools. %_prefix/lib/mono/4.0/Microsoft.VisualBasic.targets %_prefix/lib/mono/4.0/Mono.CodeContracts.dll %_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/ccrewrite.exe* %_prefix/lib/mono/4.0/cert2spc.exe* @@ -1103,6 +1125,7 @@ Mono development tools. License: LGPL v2.1 only Summary: Monodoc - Documentation tools for C# code Group: Development/Tools/Other +Requires: mono-core == %version-%release Obsoletes: monodoc Provides: monodoc # Added to uncompress and compare documentation used by build-compare @@ -1147,6 +1170,7 @@ Monodoc-core contains documentation tools for C#. License: LGPL v2.1 only Summary: Install everything built from the mono source tree Group: Development/Languages/Mono +Requires: mono-core = %version-%release Requires: ibm-data-db2 = %version-%release Requires: libmono-2_0-1 = %version-%release Requires: libmono-2_0-devel = %version-%release @@ -1157,7 +1181,6 @@ Requires: libmono-llvm0 = %version-%release Requires: libmonosgen-2_0-0 = %version-%release Requires: libmonosgen-2_0-devel = %version-%release %endif -Requires: mono-core = %version-%release Requires: mono-data = %version-%release Requires: mono-data-oracle = %version-%release Requires: mono-data-postgresql = %version-%release -- 2.11.4.GIT