SHA256
1
0
forked from pool/mono-core

Accepting request 150354 from Mono:Factory

- Add mono-core-target-4.0.patch: Use .Net runtime 4.0 as default
  for Nunit and Cairo. (forwarded request 150340 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/150354
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=67
This commit is contained in:
Stephan Kulow 2013-01-30 14:12:03 +00:00 committed by Git OBS Bridge
commit f089b4d317
5 changed files with 92 additions and 8 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:642f77c2ba2f90637638f453c579e9385c36ecf8b5cafe16307323746f43c44f
size 67323152

3
mono-3.0.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:391de107a8cc4d71fc3728f253cde11a66d2fed91f6e57f440d6f8ab5b6388e6
size 66510559

View File

@ -0,0 +1,31 @@
Index: mono-3.0.3/data/mono-cairo.pc.in
===================================================================
--- mono-3.0.3.orig/data/mono-cairo.pc.in
+++ mono-3.0.3/data/mono-cairo.pc.in
@@ -6,4 +6,4 @@ includedir=${prefix}/include
Name: Mono.Cairo
Description: Cairo bindings for Mono
Version: @VERSION@
-Libs: -r:${prefix}/lib/mono/2.0/Mono.Cairo.dll
+Libs: -r:${prefix}/lib/mono/4.0/Mono.Cairo.dll
Index: mono-3.0.3/data/mono-nunit.pc.in
===================================================================
--- mono-3.0.3.orig/data/mono-nunit.pc.in
+++ mono-3.0.3/data/mono-nunit.pc.in
@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
Name: Mono NUnit
Description: Mono's version of NUnit
Version: @VERSION@
-Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll
+Libs: -r:${libdir}/mono/4.0/nunit.core.dll -r:${libdir}/mono/4.0/nunit.core.interfaces.dll -r:${libdir}/mono/4.0/nunit.core.extensions.dll -r:${libdir}/mono/4.0/nunit.framework.dll -r:${libdir}/mono/4.0/nunit.framework.extensions.dll -r:${libdir}/mono/4.0/nunit.mocks.dll -r:${libdir}/mono/4.0/nunit.util.dll -r:${libdir}/mono/4.0/nunit-console-runner.dll
Index: mono-3.0.3/data/mono.web.pc.in
===================================================================
--- mono-3.0.3.orig/data/mono.web.pc.in
+++ mono-3.0.3/data/mono.web.pc.in
@@ -1,4 +1,4 @@
Name: Mono.Web
Description: Mono ASP.NET extension classes
-Version: 2.0.0.0
-Libs: -r:@prefix@/lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
+Version: 4.0.0.0
+Libs: -r:@prefix@/lib/mono/gac/Mono.Web/4.0.0.0__0738eb9f132ed756/Mono.Web.dll

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Jan 29 08:15:12 UTC 2013 - dimstar@opensuse.org
- Add mono-core-target-4.0.patch: Use .Net runtime 4.0 as default
for Nunit and Cairo.
-------------------------------------------------------------------
Fri Jan 11 11:41:47 UTC 2013 - mailaender@opensuse.org
- Update to http://www.mono-project.com/Release_Notes_Mono_3.0.3
* Bug fixes to the 3.0.x series
- new sub-package mono-reactive including http://rx.codeplex.com/
-------------------------------------------------------------------
Thu Dec 27 17:52:57 UTC 2012 - dvaleev@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package mono-core
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,7 +26,7 @@
%endif
Name: mono-core
Version: 3.0.2
Version: 3.0.3
Release: 0
Summary: A
License: LGPL-2.1
@ -41,6 +41,8 @@ Patch2: mono-arm-cpuinfo-v7.patch
Patch3: mono-arm-vfp.patch
# PATCH-FIX-OPENSUSE ppc.patch dvaleev@suse.com -- fix ppc build failures
Patch4: ppc.patch
# PATCH-FIX-UPSTREAM mono-core-target-4.0.patch dimstar@opensuse.org -- Use runtime 4.0 as default for cairo and nunit
Patch5: mono-core-target-4.0.patch
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -115,6 +117,7 @@ technologies that have been submitted to the ECMA for standardization.
%patch3 -p1
%endif
%patch4 -p1
%patch5 -p1
%build
# These are only needed if there are patches to the runtime
@ -181,9 +184,6 @@ rm %{buildroot}%{_prefix}%{_prefix}
rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%endif
%clean
rm -rf %{buildroot}
%files -f mcs.lang
%defattr(-, root, root)
%doc AUTHORS COPYING.LIB ChangeLog NEWS README
@ -1339,6 +1339,45 @@ usually need to write
%{_prefix}/lib/mono/gac/EntityFramework.SqlServer
%{_prefix}/lib/mono/gac/EntityFramework
%package -n mono-reactive
Summary: Reactive Extensions
License: Apache-2.0
Group: Development/Languages/Mono
Requires: mono-core = %{version}
%description -n mono-reactive
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.
Microsoft's Reactive Extensions.
%files -n mono-reactive
%defattr(-, root, root)
%{_libdir}/pkgconfig/reactive.pc
%{_prefix}/lib/mono/4.5/System.Reactive.Core.dll
%{_prefix}/lib/mono/4.5/System.Reactive.Debugger.dll
%{_prefix}/lib/mono/4.5/System.Reactive.Experimental.dll
%{_prefix}/lib/mono/4.5/System.Reactive.Interfaces.dll
%{_prefix}/lib/mono/4.5/System.Reactive.Linq.dll
%{_prefix}/lib/mono/4.5/System.Reactive.PlatformServices.dll
%{_prefix}/lib/mono/4.5/System.Reactive.Providers.dll
%{_prefix}/lib/mono/4.5/System.Reactive.Runtime.Remoting.dll
%{_prefix}/lib/mono/4.5/System.Reactive.Windows.Forms.dll
%{_prefix}/lib/mono/4.5/System.Reactive.Windows.Threading.dll
%{_prefix}/lib/mono/gac/System.Reactive.Core/
%{_prefix}/lib/mono/gac/System.Reactive.Debugger/
%{_prefix}/lib/mono/gac/System.Reactive.Experimental/
%{_prefix}/lib/mono/gac/System.Reactive.Interfaces/
%{_prefix}/lib/mono/gac/System.Reactive.Linq/
%{_prefix}/lib/mono/gac/System.Reactive.PlatformServices/
%{_prefix}/lib/mono/gac/System.Reactive.Providers/
%{_prefix}/lib/mono/gac/System.Reactive.Runtime.Remoting/
%{_prefix}/lib/mono/gac/System.Reactive.Windows.Forms/
%{_prefix}/lib/mono/gac/System.Reactive.Windows.Threading/
%package -n monodoc-core
Summary: Monodoc - Documentation tools for C# code
License: LGPL-2.1
@ -1407,6 +1446,7 @@ Requires: mono-devel = %{version}
Requires: mono-extras = %{version}
Requires: mono-locale-extras = %{version}
Requires: mono-nunit = %{version}
Requires: mono-reactive = %{version}
Requires: mono-wcf = %{version}
Requires: mono-web = %{version}
Requires: mono-winforms = %{version}