From 2109468e9459211f45c871f348ad4d1e8f63ba48 Mon Sep 17 00:00:00 2001 From: chkr Date: Jan 16 2010 22:55:31 +0000 Subject: - Update to 2.4.3.1 - Drop mono-242-metadata-appconf.patch (fixed upstream) - package mono.snk for packages without bundled keys to use - put mono.snk in /etc/pki/mono/ - package /etc/pki/mono/* in mono-devel - change %gac_dll macro to be more specific about the files to package (necessary to correctly select all files for the moonlight subpackage without any dangling symlinks) --- diff --git a/.cvsignore b/.cvsignore index aef0687..f80b3b9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mono-2.4.2.3.tar.bz2 +mono-2.4.3.1.tar.bz2 diff --git a/lc b/lc new file mode 100644 index 0000000..9c7558a --- /dev/null +++ b/lc @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/mono $MONO_OPTIONS `/usr/bin/monodir`/2.0/lc.exe "$@" diff --git a/mono.snk b/mono.snk new file mode 100644 index 0000000..2a9ae4c Binary files /dev/null and b/mono.snk differ diff --git a/mono.spec b/mono.spec index 9929877..e8869dc 100644 --- a/mono.spec +++ b/mono.spec @@ -1,8 +1,8 @@ #%define svnver 138447 Name: mono -Version: 2.4.2.3 -Release: 2%{?dist} +Version: 2.4.3.1 +Release: 1%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -10,8 +10,14 @@ License: MIT URL: http://www.mono-project.com/Main_Page # Prereleases are available here # http://mono.ximian.com/monobuild/preview/sources-preview/ -Source0: http://mono.ximian.com/monobuild/snapshot/sources-trunk/%name-%version.tar.bz2 +Source0: http://ftp.novell.com/pub/mono/sources/mono/%name-%version.tar.bz2 Source1: monodir.c +# This key was generated by Tom "spot" Callaway on Dec 1, 2009 +# by running the following command: +# sn -k mono.snk +# You should not regenerate this unless you have a really, really, really good reason. +Source2: mono.snk +Source3: lc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison @@ -46,7 +52,6 @@ Patch4: mono-2.0-monoservice.patch Patch5: mono-2.0-metadata-makefile.patch Patch6: mono-242-libgdiplusconfig.patch Patch7: mono-22-libdir.patch -Patch8: mono-242-metadata-appconf.patch %description The Mono runtime implements a JIT engine for the ECMA CLI @@ -272,11 +277,9 @@ Requires: mono-core = %{version}-%{release} mono-moonlight are all the parts required for moonlight compilation %define monodir %{_libdir}/mono -%define gac_dll(dll) %{monodir}/gac/%{1} \ - %{monodir}/?.0/%{1}.dll \ - %{nil} -%define moon_dll(dll) %{monodir}/gac/%{1} \ - %{monodir}/2.1/%{1}.dll \ +%define gac_dll(mv, gv, name) %dir %{monodir}/gac/%{3} \ + %{monodir}/gac/%{3}/%{2} \ + %{monodir}/%{1}/%{3}.dll \ %{nil} %define mono_bin(bin) %{_bindir}/%{1} \ %{monodir}/?.0/%{1}.exe \ @@ -300,8 +303,7 @@ mono-moonlight are all the parts required for moonlight compilation %patch3 -p1 -b .uselibdir %patch4 -p1 -b .monoservice %patch5 -p1 -b .metadata-makefile -%patch8 -p1 -b .metadata-appconf -%patch6 -p1 -b .libgdiplus +%patch6 -p1 -F 2 -b .libgdiplus sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7} %patch7 -p1 -b .libdir-22 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7} @@ -338,6 +340,12 @@ make make DESTDIR=%{buildroot} install install monodir %{buildroot}%{_bindir} +# copy the mono.snk key into /etc/pki/mono +mkdir -p %{buildroot}%{_sysconfdir}/pki/mono +install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/ + +install -m 755 %{SOURCE3} %{buildroot}%{_bindir}/ + %{__rm} %{buildroot}%{_libdir}/*.la %{__rm} %{buildroot}%{_libdir}/*.a @@ -394,7 +402,7 @@ install monodir %{buildroot}%{_bindir} %mono_bin mozroots %mono_bin setreg %mono_bin sn -%{monodir}/2.0/System.Xml.Linq.dll +%mono_bin lc %{_libdir}/libmono.so.* %{_libdir}/libmono-profiler-logging.so.* %{_mandir}/man1/certmgr.1.gz @@ -414,33 +422,36 @@ install monodir %{buildroot}%{_bindir} %dir %{monodir}/3.5 %dir %{monodir}/gac %dir %{monodir}/compat-* -%gac_dll Commons.Xml.Relaxng -%gac_dll I18N -%gac_dll I18N.West -%gac_dll ICSharpCode.SharpZipLib +%gac_dll ?.0 * Commons.Xml.Relaxng +%gac_dll ?.0 * I18N +%gac_dll ?.0 * I18N.West +%gac_dll ?.0 * ICSharpCode.SharpZipLib %{monodir}/compat-*/ICSharpCode.SharpZipLib.dll %{monodir}/gac/Mono.Cecil %{monodir}/gac/Mono.Cecil.Mdb -%gac_dll cscompmgd -%gac_dll CustomMarshalers -%gac_dll Microsoft.VisualC -%gac_dll Mono.C5 -%gac_dll Mono.Cairo -%gac_dll Mono.CompilerServices.SymbolWriter -%gac_dll Mono.CSharp -%gac_dll System.Drawing -%gac_dll Mono.GetOptions -%gac_dll Mono.Management -%gac_dll Mono.Posix -%gac_dll Mono.Security -%gac_dll Mono.Simd -%gac_dll OpenSystem.C -%gac_dll System -%gac_dll System.Configuration -%gac_dll System.Core -%gac_dll System.Security -%gac_dll System.Xml -%{monodir}/gac/System.Xml.Linq +%gac_dll ?.0 * cscompmgd +%gac_dll ?.0 * CustomMarshalers +%gac_dll ?.0 * Microsoft.VisualC +%gac_dll ?.0 * Mono.C5 +%gac_dll ?.0 * Mono.Cairo +%gac_dll 1.0 1.0* Mono.CompilerServices.SymbolWriter +%gac_dll 2.0 2.0.0* Mono.CompilerServices.SymbolWriter +%gac_dll ?.0 * Mono.CSharp +%gac_dll ?.0 * System.Drawing +%gac_dll ?.0 * Mono.GetOptions +%gac_dll ?.0 * Mono.Management +%gac_dll ?.0 * Mono.Posix +%gac_dll ?.0 * Mono.Security +%gac_dll ?.0 * Mono.Simd +%gac_dll ?.0 * OpenSystem.C +%gac_dll 1.0 1.0* System +%gac_dll 2.0 2.0.0* System +%gac_dll ?.0 * System.Configuration +%gac_dll ?.0 3.5.0* System.Core +%gac_dll ?.0 * System.Security +%gac_dll 1.0 1.0* System.Xml +%gac_dll 2.0 2.0.0* System.Xml +%gac_dll 2.0 3.5* System.Xml.Linq %{monodir}/?.0/mscorlib.dll %{monodir}/?.0/mscorlib.dll.mdb %dir %{_sysconfdir}/mono @@ -455,6 +466,7 @@ install monodir %{buildroot}%{_bindir} %files devel %defattr(-,root,root,-) +%{_sysconfdir}/pki/mono/ %{_bindir}/mono-api-* %{monodir}/?.0/mono-api-info* %{_bindir}/monodis @@ -504,6 +516,7 @@ install monodir %{buildroot}%{_bindir} %{_mandir}/man1/dtd2xsd.1.gz %{_mandir}/man1/genxs.1.gz %{_mandir}/man1/ilasm.1.gz +%{_mandir}/man1/lc.1.gz %{_mandir}/man1/macpack.1.gz %{_mandir}/man1/makecert.1.gz %{_mandir}/man1/mkbundle.1.gz @@ -518,16 +531,18 @@ install monodir %{buildroot}%{_bindir} %{_mandir}/man1/secutil.1.gz %{_mandir}/man1/sgen.1.gz %{_mandir}/man1/signcode.1.gz -%gac_dll PEAPI -%gac_dll Microsoft.Build.Engine -%gac_dll Microsoft.Build.Framework -%gac_dll Microsoft.Build.Tasks -%gac_dll Microsoft.Build.Utilities +%{_mandir}/man1/xbuild.1.gz +%gac_dll ?.0 * PEAPI +%gac_dll ?.0 * Microsoft.Build.Engine +%gac_dll ?.0 * Microsoft.Build.Framework +%gac_dll ?.0 * Microsoft.Build.Tasks +%gac_dll ?.0 * Microsoft.Build.Utilities %{monodir}/2.0/MSBuild %{monodir}/2.0/Microsoft.Build.xsd %{monodir}/2.0/Microsoft.*.targets %{monodir}/2.0/Microsoft.Common.tasks %{monodir}/2.0/xbuild.rsp +%{monodir}/xbuild %{_bindir}/monograph %{_libdir}/libmono-profiler-aot.* %{_libdir}/libmono-profiler-cov.* @@ -554,29 +569,29 @@ install monodir %{buildroot}%{_bindir} %defattr(-,root,root,-) %{_libdir}/mono/2.1/*.mdb %{_libdir}/mono/2.1/smcs.exe -%{_libdir}/mono/2.1/Mono.CompilerServices.SymbolWriter.dll -%{_libdir}/mono/2.1/System.Core.dll -%{_libdir}/mono/2.1/System.Runtime.Serialization.dll -%{_libdir}/mono/2.1/System.ServiceModel.Web.dll -%{_libdir}/mono/2.1/System.ServiceModel.dll -%{_libdir}/mono/2.1/System.Xml.Linq.dll -%{_libdir}/mono/2.1/System.Xml.dll -%{_libdir}/mono/2.1/System.dll -%{_libdir}/mono/2.1/mscorlib.dll -%moon_dll System.Net +%gac_dll 2.1 2.0.5* Mono.CompilerServices.SymbolWriter +%gac_dll 2.1 2.0.5* System.Net +%gac_dll 2.1 2.0.5* System.Xml +%gac_dll 2.1 2.0.5* System.Xml.Linq +%gac_dll 2.1 2.0.5* System.Core +%gac_dll 2.1 2.0.5* System.Runtime.Serialization +%gac_dll 2.1 2.0.5* System.ServiceModel.Web +%gac_dll 2.1 2.0.5* System.ServiceModel +%gac_dll 2.1 2.0.5* System +%{_libdir}/mono/2.1/mscorlib* %files nunit %defattr(-,root,root,-) %mono_bin_1 nunit-console nunit-console %mono_bin_2 nunit-console2 nunit-console -%gac_dll nunit.core -%gac_dll nunit.framework -%gac_dll nunit.util -%gac_dll nunit.mocks -%gac_dll nunit-console-runner -%gac_dll nunit.core.extensions -%gac_dll nunit.core.interfaces -%gac_dll nunit.framework.extensions +%gac_dll ?.0 * nunit.core +%gac_dll ?.0 * nunit.framework +%gac_dll ?.0 * nunit.util +%gac_dll ?.0 * nunit.mocks +%gac_dll ?.0 * nunit-console-runner +%gac_dll ?.0 * nunit.core.extensions +%gac_dll ?.0 * nunit.core.interfaces +%gac_dll ?.0 * nunit.framework.extensions %files nunit-devel %defattr(-,root,root,-) @@ -584,15 +599,15 @@ install monodir %{buildroot}%{_bindir} %files locale-extras %defattr(-,root,root,-) -%gac_dll I18N.MidEast -%gac_dll I18N.Rare -%gac_dll I18N.CJK -%gac_dll I18N.Other +%gac_dll ?.0 * I18N.MidEast +%gac_dll ?.0 * I18N.Rare +%gac_dll ?.0 * I18N.CJK +%gac_dll ?.0 * I18N.Other %files jscript %defattr(-,root,root,-) %mono_bin mjs -%gac_dll Microsoft.JScript +%gac_dll ?.0 * Microsoft.JScript %files extras %defattr(-,root,root,-) @@ -600,40 +615,40 @@ install monodir %{buildroot}%{_bindir} %mono_bin_1 mono-service mono-service %mono_bin_2 mono-service2 mono-service %{monodir}/gac/mono-service -%gac_dll System.Configuration.Install -%gac_dll System.Management -%gac_dll System.Messaging -%gac_dll System.ServiceProcess -%gac_dll Microsoft.Vsa -%gac_dll Mono.Messaging.RabbitMQ -%gac_dll Mono.Messaging -%gac_dll RabbitMQ.Client +%gac_dll ?.0 * System.Configuration.Install +%gac_dll ?.0 * System.Management +%gac_dll ?.0 * System.Messaging +%gac_dll ?.0 * System.ServiceProcess +%gac_dll ?.0 * Microsoft.Vsa +%gac_dll ?.0 * Mono.Messaging.RabbitMQ +%gac_dll ?.0 * Mono.Messaging +%gac_dll ?.0 * RabbitMQ.Client %files wcf %defattr(-, root, root, -) -%gac_dll System.IdentityModel -%gac_dll System.IdentityModel.Selectors -%gac_dll System.Runtime.Serialization -%gac_dll System.ServiceModel -%gac_dll System.ServiceModel.Web +%gac_dll ?.0 * System.IdentityModel +%gac_dll ?.0 * System.IdentityModel.Selectors +%gac_dll 2.0 3.0* System.Runtime.Serialization +%gac_dll ?.0 3.0* System.ServiceModel +%gac_dll 2.0 3.0* System.ServiceModel.Web %files web %defattr(-,root,root,-) -%gac_dll Mono.Http -%gac_dll Mono.Web -%gac_dll System.ComponentModel.DataAnnotations -%gac_dll System.Runtime.Remoting -%gac_dll System.Runtime.Serialization.Formatters.Soap -%gac_dll System.Web -%gac_dll System.Web.Abstractions -%gac_dll System.Web.DynamicData -%gac_dll System.Web.Extensions -%gac_dll System.Web.Extensions.Design +%gac_dll ?.0 * Mono.Http +%gac_dll ?.0 * Mono.Web +%gac_dll ?.0 * System.ComponentModel.DataAnnotations +%gac_dll ?.0 * System.Runtime.Remoting +%gac_dll ?.0 * System.Runtime.Serialization.Formatters.Soap +%gac_dll ?.0 * System.Web +%gac_dll ?.0 * System.Web.Abstractions +%gac_dll ?.0 * System.Web.DynamicData +%gac_dll ?.0 * System.Web.Extensions +%gac_dll ?.0 * System.Web.Extensions.Design %{monodir}/compat-2.0/System.Web.Extensions*dll %{monodir}/3.5/System.Web.Extensions* -%gac_dll System.Web.Mvc -%gac_dll System.Web.Routing -%gac_dll System.Web.Services +%gac_dll ?.0 * System.Web.Mvc +%gac_dll ?.0 * System.Web.Routing +%gac_dll ?.0 * System.Web.Services %mono_bin disco %mono_bin mconfig %mono_bin soapsuds @@ -660,73 +675,73 @@ install monodir %{buildroot}%{_bindir} %defattr(-,root,root,-) %{_libdir}/pkgconfig/mono.web.pc %{_libdir}/pkgconfig/system.web.extensions_1.0.pc +%{_libdir}/pkgconfig/system.web.mvc.pc %{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc %files winforms %defattr(-,root,root,-) -%gac_dll Accessibility -%gac_dll System.Design -%gac_dll System.Drawing.Design -%gac_dll System.Windows.Forms +%gac_dll ?.0 * Accessibility +%gac_dll ?.0 * System.Design +%gac_dll ?.0 * System.Drawing.Design +%gac_dll ?.0 * System.Windows.Forms # Put here temporarily to break dependency issues # (cf. openSUSE packaging). Will be fixed post 1.2.5 -%gac_dll Mono.WebBrowser +%gac_dll ?.0 * Mono.WebBrowser %files data %defattr(-,root,root,-) %mono_bin sqlsharp %{_mandir}/man1/sqlsharp.1.gz -%gac_dll System.Data -%gac_dll System.Data.DataSetExtensions -%gac_dll System.Data.Linq -%gac_dll Mono.Data -%gac_dll Mono.Data.Tds -%gac_dll Mono.Data.TdsClient -%gac_dll System.EnterpriseServices -%gac_dll Novell.Directory.Ldap -%gac_dll System.DirectoryServices -%gac_dll System.Transactions +%gac_dll ?.0 * System.Data +%gac_dll ?.0 * System.Data.DataSetExtensions +%gac_dll 2.0 * System.Data.Linq +%gac_dll ?.0 * Mono.Data +%gac_dll ?.0 * Mono.Data.Tds +%gac_dll ?.0 * Mono.Data.TdsClient +%gac_dll ?.0 * System.EnterpriseServices +%gac_dll ?.0 * Novell.Directory.Ldap +%gac_dll ?.0 * System.DirectoryServices +%gac_dll ?.0 * System.Transactions %files data-sqlite %defattr(-,root,root,-) -%gac_dll Mono.Data.SqliteClient -%gac_dll Mono.Data.Sqlite +%gac_dll ?.0 * Mono.Data.SqliteClient +%gac_dll ?.0 * Mono.Data.Sqlite %files data-sybase %defattr(-,root,root,-) -%gac_dll Mono.Data.SybaseClient +%gac_dll ?.0 * Mono.Data.SybaseClient %files data-oracle %defattr(-,root,root,-) -%gac_dll System.Data.OracleClient +%gac_dll ?.0 * System.Data.OracleClient %files data-postgresql %defattr(-,root,root,-) -%gac_dll Npgsql +%gac_dll ?.0 * Npgsql %files data-firebird %defattr(-,root,root,-) -%gac_dll FirebirdSql.Data.Firebird +%gac_dll ?.0 * FirebirdSql.Data.Firebird %files -n bytefx-data-mysql %defattr(-,root,root,-) -%gac_dll ByteFX.Data +%gac_dll ?.0 * ByteFX.Data %files -n ibm-data-db2 %defattr(-,root,root,-) -%gac_dll IBM.Data.DB2 +%gac_dll ?.0 * IBM.Data.DB2 %files -n monodoc %defattr(-, root, root) %{_libdir}/mono/gac/monodoc %{_libdir}/monodoc/* -%{_libdir}/mono/monodoc/monodoc.dll +%{_libdir}/mono/monodoc %mono_bin mdoc %mono_bin mod %{_bindir}/mdoc-* %{_bindir}/mdass* %{_bindir}/mdval* -%{_bindir}/mod %{_bindir}/monodoc* %{_mandir}/man1/md* %{_mandir}/man1/monodoc* @@ -737,6 +752,16 @@ install monodir %{buildroot}%{_bindir} %{_libdir}/pkgconfig/monodoc.pc %changelog +* Sat Jan 16 2010 Christian Krause - 2.4.3.1-1 +- Update to 2.4.3.1 +- Drop mono-242-metadata-appconf.patch (fixed upstream) +- package mono.snk for packages without bundled keys to use +- put mono.snk in /etc/pki/mono/ +- package /etc/pki/mono/* in mono-devel +- change %%gac_dll macro to be more specific about the files to package + (necessary to correctly select all files for the moonlight subpackage + without any dangling symlinks) + * Tue Aug 25 2009 Michel Salim - 2.4.2.3-2 - Rearrange assemblies to properly fix bz 434709: * mono-core can now be installed on its own, no longer pulling in diff --git a/sources b/sources index ec04774..d56b067 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -696f25afc8453cd0d1c78de6e905dcf2 mono-2.4.2.3.tar.bz2 +df10f131b1cf23ed7a908d8db1b8b194 mono-2.4.3.1.tar.bz2