From 95b2933428623910bae9d136b91ee21565747e8d9cf9e1134b648a2be00b50f8 Mon Sep 17 00:00:00 2001 From: Stephen Shaw Date: Tue, 7 Aug 2012 12:26:06 +0000 Subject: [PATCH] Accepting request 128708 from home:k0da:ppc - fix ppc build OBS-URL: https://build.opensuse.org/request/show/128708 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=76 --- mono-core.changes | 5 ++++ mono-core.spec | 61 +++++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/mono-core.changes b/mono-core.changes index 3cc5f07..d802b33 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 21 23:08:36 UTC 2012 - dvaleev@suse.com + +- fix ppc build + ------------------------------------------------------------------- Fri Oct 7 14:47:35 CEST 2011 - dmueller@suse.de diff --git a/mono-core.spec b/mono-core.spec index ed585ee..bfe55b9 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -1,7 +1,7 @@ # # spec file for package mono-core # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,12 +26,12 @@ %endif Name: mono-core -License: LGPL v2.1 only -Group: Development/Languages/Mono Summary: A .NET Runtime Environment +License: LGPL-2.1 +Group: Development/Languages/Mono Url: http://www.mono-project.com Version: 2.10.6 -Release: 1 +Release: 0 Source0: mono-%{version}.tar.bz2 BuildRequires: bison BuildRequires: fdupes @@ -116,6 +116,9 @@ export PATH=/opt/novell/llvm-mono/bin:$PATH --enable-loadedllvm \ --disable-system-aot \ %endif +%ifarch ppc + --with-mcs-docs=no \ +%endif %ifnarch %ix86 x86_64 --disable-system-aot \ %endif @@ -307,8 +310,8 @@ rm -rf %buildroot %_prefix/lib/mono/mono-configuration-crypto %package -n libmono-2_0-1 -License: LGPL v2.1 only Summary: A Library for embedding Mono in your Application +License: LGPL-2.1 Group: Development/Libraries/C and C++ %description -n libmono-2_0-1 @@ -329,8 +332,8 @@ A Library for embedding Mono in your Application. %postun -n libmono-2_0-1 -p /sbin/ldconfig %package -n libmono-2_0-devel -License: LGPL v2.1 only Summary: Development files for libmono +License: LGPL-2.1 Group: Development/Languages/Mono Requires: libmono-2_0-1 == %version Requires: mono-core == %version @@ -355,8 +358,8 @@ Development files for libmono. %if %sgen == yes %package -n libmonosgen-2_0-0 -License: LGPL v2.1 only Summary: A Library for embedding Mono in your Application (sgen version) +License: LGPL-2.1 Group: Development/Libraries/C and C++ %description -n libmonosgen-2_0-0 @@ -377,11 +380,11 @@ A Library for embedding Mono in your Application (sgen version). %postun -n libmonosgen-2_0-0 -p /sbin/ldconfig %package -n libmonosgen-2_0-devel -License: LGPL v2.1 only Summary: Development files for libmonosgen +License: LGPL-2.1 Group: Development/Languages/Mono -Requires: mono-core == %version Requires: libmono-2_0-devel +Requires: mono-core == %version %description -n libmonosgen-2_0-devel The Mono Project is an open development initiative that is working to @@ -403,8 +406,8 @@ Development files for libmonosgen. %if %llvm == yes %package -n libmono-llvm0 -License: LGPL v2.1 only Summary: Loadable LLVM libary for mono +License: LGPL-2.1 Group: Development/Libraries/C and C++ %description -n libmono-llvm0 @@ -426,8 +429,8 @@ Loadable LLVM libary for mono. %endif %package -n mono-locale-extras -License: LGPL v2.1 only Summary: Extra locale information +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version Provides: mono(I18N.CJK) = 1.0.5000.0 @@ -460,8 +463,8 @@ Extra locale information. %_prefix/lib/mono/gac/I18N.Rare %package -n mono-data -License: LGPL v2.1 only Summary: Database connectivity for Mono +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version Obsoletes: mono-directory @@ -523,8 +526,8 @@ Database connectivity for Mono. %_prefix/lib/mono/gac/WebMatrix.Data %package -n mono-winforms -License: LGPL v2.1 only Summary: Mono's Windows Forms implementation +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version Provides: mono-window-forms @@ -565,8 +568,8 @@ Mono's Windows Forms implementation. %_prefix/lib/mono/gac/System.Windows.Forms.DataVisualization %package -n ibm-data-db2 -License: LGPL v2.1 only Summary: Database connectivity for DB2 +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version @@ -586,8 +589,8 @@ Database connectivity for DB2. %_prefix/lib/mono/gac/IBM.Data.DB2 %package -n mono-extras -License: LGPL v2.1 only Summary: Extra packages +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version Obsoletes: mono-ms-extras @@ -648,8 +651,8 @@ Extra packages. %_prefix/lib/mono/gac/mono-service %package -n mono-data-sqlite -License: LGPL v2.1 only Summary: Database connectivity for Mono +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version Requires: mono-data == %version @@ -671,8 +674,8 @@ Database connectivity for Mono. %_prefix/lib/mono/gac/Mono.Data.Sqlite %package -n mono-wcf -License: MIT License (or similar) ; Ms-Pl Summary: Mono implementation of WCF, Windows Communication Foundation +License: MIT ; MS-PL Group: Development/Languages/Mono Requires: mono-core == %version @@ -713,8 +716,8 @@ Mono implementation of WCF, Windows Communication Foundation %_prefix/lib/mono/gac/System.ServiceModel.Web %package -n mono-winfxcore -License: MIT License (or similar) ; Ms-Pl Summary: Mono implementation of core WinFX APIs +License: MIT ; MS-PL Group: Development/Languages/Mono Requires: mono-core == %version @@ -737,8 +740,8 @@ Mono implementation of core WinFX APIs %_prefix/lib/mono/gac/WindowsBase %package -n mono-web -License: MIT License (or similar) ; Ms-Pl Summary: Mono implementation of ASP.NET, Remoting and Web Services +License: MIT ; MS-PL Group: Development/Languages/Mono Requires: mono-core == %version Obsoletes: mono-remoting @@ -826,8 +829,8 @@ Mono implementation of ASP.NET, Remoting and Web Services. %_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 +License: MIT ; MS-PL Group: Development/Languages/Mono Requires: mono-core == %version @@ -862,8 +865,8 @@ Mono implementation of ASP.NET MVC. %_prefix/lib/mono/gac/System.Web.Mvc %package -n mono-data-oracle -License: LGPL v2.1 only Summary: Database connectivity for Mono +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version Requires: mono-data == %version @@ -885,8 +888,8 @@ Database connectivity for Mono. %_prefix/lib/mono/gac/System.Data.OracleClient %package -n mono-data-postgresql -License: LGPL v2.1 only Summary: Database connectivity for Mono +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version Requires: mono-data == %version @@ -908,8 +911,8 @@ Database connectivity for Mono. %_prefix/lib/mono/gac/Npgsql %package -n mono-nunit -License: LGPL v2.1 only Summary: NUnit Testing Framework +License: LGPL-2.1 Group: Development/Languages/Mono Requires: mono-core == %version @@ -955,11 +958,11 @@ brings xUnit to all .NET languages. %_prefix/lib/mono/gac/nunit.util %package -n mono-devel -License: LGPL v2.1 only Summary: Mono development tools +License: LGPL-2.1 Group: Development/Languages/Mono -Requires: mono-core == %version Requires: libgdiplus0 +Requires: mono-core == %version Requires: pkgconfig Provides: mono-xbuild # Required because they are referenced by .pc files @@ -1155,8 +1158,8 @@ Mono development tools. %_prefix/lib/mono/xbuild-frameworks %package -n monodoc-core -License: LGPL v2.1 only Summary: Monodoc - Documentation tools for C# code +License: LGPL-2.1 Group: Development/Tools/Other Requires: mono-core == %version Obsoletes: monodoc @@ -1197,16 +1200,18 @@ Monodoc-core contains documentation tools for C#. %_prefix/lib/mono/4.0/mod.exe* %_prefix/lib/mono/gac/monodoc %_prefix/lib/mono/monodoc +%ifnarch ppc %_prefix/lib/monodoc +%endif %package -n mono-complete -License: LGPL v2.1 only Summary: Install everything built from the mono source tree +License: LGPL-2.1 Group: Development/Languages/Mono -Requires: mono-core = %version Requires: ibm-data-db2 = %version Requires: libmono-2_0-1 = %version Requires: libmono-2_0-devel = %version +Requires: mono-core = %version %if %llvm == yes Requires: libmono-llvm0 = %version %endif