Updated to 3.12.1

This commit is contained in:
Denis Silakov 2015-07-10 12:42:37 +03:00
parent 0905294456
commit b8918bda2d
3 changed files with 32 additions and 25 deletions

View file

@ -1,5 +1,6 @@
removed_sources:
mono-2.10.9.tar.bz2: 1a6e8c5a0c3d88d87982259aa04402e028a283de
sources:
mono-3.4.0.tar.bz2: bae86f50f9a29d68d4e1917358996e7186e7f89e
sources:
mono-3.12.1.tar.bz2: c525a37e95607af588f3fcb2ff919997949e8728
mono.snk: b1ed4139f1dec3258166918570852bfc77f68dbb

View file

@ -1,5 +1,6 @@
--- mono-3.0.12/data/config.in.orig 2013-07-08 23:45:09.075000000 +0200
+++ mono-3.0.12/data/config.in 2013-07-08 23:46:07.143000000 +0200
diff -Naur mono-3.12.1.orig/data/config.in mono-3.12.1/data/config.in
--- mono-3.12.1.orig/data/config.in 2015-07-09 15:46:31.851873352 +0300
+++ mono-3.12.1/data/config.in 2015-07-09 15:54:33.674856211 +0300
@@ -5,12 +5,13 @@
<dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
<dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
@ -11,21 +12,21 @@
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
+ <dllmap dll="gluezilla" target="libgluezilla.so.0"/>
<dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
+ <dllmap dll="gluezilla" target="libgluezilla.so.0"/>
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
@@ -26,8 +27,8 @@
@@ -29,8 +30,8 @@
<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
</dllmap>
- <dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
- <dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
+ <dllmap dll="gdiplus" target="libgdiplus@libsuffix@.0" os="!windows"/>
+ <dllmap dll="gdiplus.dll" target="libgdiplus@libsuffix@.0" os="!windows"/>
- <dllmap dll="gdi32" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
- <dllmap dll="gdi32.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
+ <dllmap dll="gdi32" target="libgdiplus@libsuffix@" os="!windows"/>
+ <dllmap dll="gdi32.dll" target="libgdiplus@libsuffix@" os="!windows"/>
- <dllmap dll="gdiplus" target="@libgdiplus_install_loc@" os="!windows"/>
- <dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@" os="!windows"/>
- <dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
- <dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
+ <dllmap dll="gdiplus" target="libgdiplus@libsuffix@.0" os="!windows"/>
+ <dllmap dll="gdiplus.dll" target="libgdiplus@libsuffix@.0" os="!windows"/>
+ <dllmap dll="gdi32" target="libgdiplus@libsuffix@" os="!windows"/>
+ <dllmap dll="gdi32.dll" target="libgdiplus@libsuffix@" os="!windows"/>
</configuration>

View file

@ -17,7 +17,7 @@
Summary: Mono Runtime
Name: mono
Version: 3.4.0
Version: 3.12.1
Release: 6
License: GPLv2 and LGPLv2+ and MIT
Group: Development/C#
@ -41,6 +41,7 @@ URL: http://www.go-mono.com/
BuildRequires: bison
BuildRequires: autoconf
BuildRequires: zlib-devel
BuildRequires: mono
%if %{oprofile_support}
BuildRequires: oprofile-devel
%endif
@ -74,7 +75,7 @@ Provides: mono(Mono.Cairo) = 1.0.5000.0
Provides: mono(Mono.CompilerServices.SymbolWriter) = 1.0.5000.0
Provides: mono(Mono.Posix) = 1.0.5000.0
Provides: mono(Mono.Security) = 1.0.5000.0
Provides: mono(OpenSystem.C) = 1.0.5000.0
#Provides: mono(OpenSystem.C) = 1.0.5000.0
Provides: mono(System) = 1.0.5000.0
Provides: mono(System.Security) = 1.0.5000.0
Provides: mono(System.Xml) = 1.0.5000.0
@ -508,12 +509,14 @@ cp -a mcs/tools/xbuild/targets/ %{buildroot}%{monodir}/4.0/Microsoft.Portable.CS
%{_bindir}/mono-test-install
%{_bindir}/csharp
#%_bindir/csharp2
%{_bindir}/cert-sync
%{_bindir}/certmgr
%{_bindir}/chktrust
%{_bindir}/dmcs
%{_bindir}/gacutil
%{_bindir}/gacutil2
%{_bindir}/gmcs
%{_bindir}/ikdasm
%{_bindir}/mcs
%{_bindir}/mozroots
%{_bindir}/peverify
@ -547,7 +550,9 @@ cp -a mcs/tools/xbuild/targets/ %{buildroot}%{monodir}/4.0/Microsoft.Portable.CS
%{monodir}/4.5/gacutil.exe
%{monodir}/4.5/gacutil.exe.mdb
#%{monodir}/2.0/gmcs.exe*
%{monodir}/4.5/cert-sync.exe*
%{monodir}/4.5/certmgr.exe*
%{monodir}/4.5/ikdasm.exe*
%{monodir}/4.5/mcs.exe*
%{monodir}/4.5/mozroots.exe*
%{monodir}/4.5/setreg.exe*
@ -671,10 +676,10 @@ cp -a mcs/tools/xbuild/targets/ %{buildroot}%{monodir}/4.0/Microsoft.Portable.CS
%{monodir}/2.0/CustomMarshalers.dll
%{monodir}/4.0/CustomMarshalers.dll
%{monodir}/4.5/CustomMarshalers.dll
%{monodir}/gac/OpenSystem.C
%{monodir}/2.0/OpenSystem.C.dll
%{monodir}/4.0/OpenSystem.C.dll
%{monodir}/4.5/OpenSystem.C.dll
#%{monodir}/gac/OpenSystem.C
#%{monodir}/2.0/OpenSystem.C.dll
#%{monodir}/4.0/OpenSystem.C.dll
#%{monodir}/4.5/OpenSystem.C.dll
%{monodir}/2.0/gmcs.exe
@ -727,7 +732,7 @@ cp -a mcs/tools/xbuild/targets/ %{buildroot}%{monodir}/4.0/Microsoft.Portable.CS
%if %sgen == yes
%{_libdir}/pkgconfig/monosgen-2.pc
%endif
%{_libdir}/pkgconfig/mono.web.pc
#%{_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
@ -990,10 +995,10 @@ cp -a mcs/tools/xbuild/targets/ %{buildroot}%{monodir}/4.0/Microsoft.Portable.CS
%{monodir}/2.0/Mono.Http.dll
%{monodir}/4.0/Mono.Http.dll
%{monodir}/4.5/Mono.Http.dll
%{monodir}/gac/Mono.Web
%{monodir}/2.0/Mono.Web.dll
%{monodir}/4.0/Mono.Web.dll
%{monodir}/4.5/Mono.Web.dll
#%{monodir}/gac/Mono.Web
#%{monodir}/2.0/Mono.Web.dll
#%{monodir}/4.0/Mono.Web.dll
#%{monodir}/4.5/Mono.Web.dll
%{monodir}/gac/System.ComponentModel.Composition
%{monodir}/4.0/System.ComponentModel.Composition.dll
%{monodir}/4.5/System.ComponentModel.Composition.dll