From 15aa1e1f3c4c38626724d14ed0cb8b7e371fe41270fd186c0858ff707dd65997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 19 Mar 2013 11:07:04 +0000 Subject: [PATCH] - Refresh and apply mono-core-target-4.0.patch - Apply ppc.patch again OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=112 --- mono-core-target-4.0.patch | 10 ---------- mono-core.changes | 6 ++++++ mono-core.spec | 11 +++++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/mono-core-target-4.0.patch b/mono-core-target-4.0.patch index 7d10723..78e5263 100644 --- a/mono-core-target-4.0.patch +++ b/mono-core-target-4.0.patch @@ -1,13 +1,3 @@ -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 diff --git a/mono-core.changes b/mono-core.changes index 7a14914..2780d3a 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 19 11:06:18 UTC 2013 - idonmez@suse.com + +- Refresh and apply mono-core-target-4.0.patch +- Apply ppc.patch again + ------------------------------------------------------------------- Sat Mar 9 14:18:45 UTC 2013 - mailaender@opensuse.org diff --git a/mono-core.spec b/mono-core.spec index be22527..e96c84d 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -33,19 +33,20 @@ License: LGPL-2.1 Group: Development/Languages/Mono Url: http://www.mono-project.com Source0: mono-%{version}.tar.bz2 -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: mono-arm-cpuinfo-v5.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch2: mono-arm-cpuinfo-v7.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines 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++ +BuildRequires: libgdiplus-devel BuildRequires: pkgconfig BuildRequires: xorg-x11-libX11-devel BuildRequires: zlib-devel -BuildRequires: libgdiplus-devel %ifnarch ia64 %arm BuildRequires: valgrind-devel %endif @@ -113,6 +114,8 @@ technologies that have been submitted to the ECMA for standardization. %patch2 -p1 %patch3 -p1 %endif +%patch4 -p1 +%patch5 -p1 %build # These are only needed if there are patches to the runtime