diff --git a/mono-core.changes b/mono-core.changes
index fdf0718..25ec9bd 100644
--- a/mono-core.changes
+++ b/mono-core.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 17 12:16:41 UTC 2020 - Berthold Gunreben <azouhr@opensuse.org>
+
+- enable btls for s390x
+- remove stale symlinks to prevent from brp-25-symlink errors
+
-------------------------------------------------------------------
Tue Dec 3 00:12:48 UTC 2019 - Philipp Seiler <p.seiler@linuxmail.org>
diff --git a/mono-core.spec b/mono-core.spec
index a9e8712..2bcbd09 100644
--- a/mono-core.spec
+++ b/mono-core.spec
@@ -1,7 +1,7 @@
#
# spec file for package mono-core
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,10 +12,9 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-# norootforbuild
%{!?ext_man: %define ext_man .gz}
%define llvm no
@@ -26,7 +25,7 @@
%define boehm yes
%endif
-%ifarch %ix86 x86_64 %{arm} aarch64 ppc64 ppc64le
+%ifarch %ix86 x86_64 %{arm} aarch64 ppc64 ppc64le s390x
%define btls yes
%else
%define btls no
@@ -44,7 +43,7 @@ Name: mono-core
Version: 6.4.0
Release: 0
Summary: Cross-platform, Open Source, .NET development framework
-License: LGPL-2.1 and MIT and MS-PL
+License: LGPL-2.1-only AND MIT AND MS-PL
Group: Development/Languages/Mono
Url: http://www.mono-project.com
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.%{version_suffix}.tar.xz
@@ -62,23 +61,23 @@ Patch16: fix-dbg-headers.patch
Patch20: xbuild-use-roslyn-vbc.patch
# PATCH-FIX-OPENSUSE fix 64bit-portability-issue at exceptions-ppc.c:799
Patch21: fix-ppc-64bit-portability-issue.patch
-BuildRequires: cmake
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
BuildRequires: ca-certificates
-BuildRequires: which
+BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkgconfig
+BuildRequires: python
BuildRequires: systemtap-sdt-devel
BuildRequires: timezone
+BuildRequires: which
BuildRequires: pkgconfig(libgdiplus)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(zlib)
-BuildRequires: python
%ifnarch ia64 %arm s390
BuildRequires: pkgconfig(valgrind)
%endif
@@ -107,52 +106,31 @@ Provides: mono(I18N) = 2.0.0.0
Provides: mono(I18N.West) = 1.0.5000.0
Provides: mono(I18N.West) = 2.0.0.0
Provides: mono(ICSharpCode.SharpZipLib) = 0.6.0.0
-Provides: mono(ICSharpCode.SharpZipLib) = 2.6.0.0
Provides: mono(ICSharpCode.SharpZipLib) = 0.84.0.0
+Provides: mono(ICSharpCode.SharpZipLib) = 2.6.0.0
Provides: mono(ICSharpCode.SharpZipLib) = 2.84.0.0
Provides: mono(Mono.Cairo) = 1.0.5000.0
Provides: mono(Mono.Cairo) = 2.0.0.0
Provides: mono(Mono.CompilerServices.SymbolWriter) = 1.0.5000.0
Provides: mono(Mono.CompilerServices.SymbolWriter) = 2.0.0.0
+Provides: mono(Mono.Configuration.Crypto) = 4.0.0.0
Provides: mono(Mono.Posix) = 1.0.5000.0
Provides: mono(Mono.Posix) = 2.0.0.0
Provides: mono(Mono.Security) = 1.0.5000.0
Provides: mono(Mono.Security) = 2.0.0.0
Provides: mono(System) = 1.0.5000.0
Provides: mono(System) = 2.0.0.0
+Provides: mono(System.Collections) = 4.0.0.0
+Provides: mono(System.Collections.Concurrent) = 4.0.0.0
+Provides: mono(System.ComponentModel) = 4.0.0.0
+Provides: mono(System.ComponentModel.Annotations) = 4.0.0.0
+Provides: mono(System.ComponentModel.EventBasedAsync) = 4.0.0.0
Provides: mono(System.Configuration) = 1.0.5000.0
Provides: mono(System.Configuration) = 2.0.0.0
-Provides: mono(System.Security) = 1.0.5000.0
-Provides: mono(System.Security) = 2.0.0.0
-Provides: mono(System.Xml) = 1.0.5000.0
-Provides: mono(System.Xml) = 2.0.0.0
Provides: mono(System.Diagnostics.Contracts) = 4.0.0.0
Provides: mono(System.Diagnostics.Debug) = 4.0.0.0
Provides: mono(System.Diagnostics.Tools) = 4.0.0.0
Provides: mono(System.Diagnostics.Tracing) = 4.0.0.0
-Provides: mono(System.Collections) = 4.0.0.0
-Provides: mono(System.Collections.Concurrent) = 4.0.0.0
-Provides: mono(System.Runtime) = 4.0.0.0
-Provides: mono(System.Runtime.Extensions) = 4.0.0.0
-Provides: mono(System.Runtime.InteropServices) = 4.0.0.0
-Provides: mono(System.Runtime.InteropServices.WindowsRuntime) = 4.0.0.0
-Provides: mono(System.Runtime.Numerics) = 4.0.0.0
-Provides: mono(System.Runtime.Serialization.Json) = 4.0.0.0
-Provides: mono(System.Runtime.Serialization.Primitives) = 4.0.0.0
-Provides: mono(System.Runtime.Serialization.Xml) = 4.0.0.0
-Provides: mono(System.Reflection) = 4.0.0.0
-Provides: mono(System.Reflection.Emit) = 4.0.0.0
-Provides: mono(System.Reflection.Emit.ILGeneration) = 4.0.0.0
-Provides: mono(System.Reflection.Emit.Lightweight) = 4.0.0.0
-Provides: mono(System.Reflection.Extensions) = 4.0.0.0
-Provides: mono(System.Reflection.Primitives) = 4.0.0.0
-Provides: mono(System.ObjectModel) = 4.0.0.0
-Provides: mono(System.Xml.ReaderWriter) = 4.0.0.0
-Provides: mono(System.Xml.XDocument) = 4.0.0.0
-Provides: mono(System.Xml.XmlSerializer) = 4.0.0.0
-Provides: mono(System.ComponentModel) = 4.0.0.0
-Provides: mono(System.ComponentModel.Annotations) = 4.0.0.0
-Provides: mono(System.ComponentModel.EventBasedAsync) = 4.0.0.0
Provides: mono(System.Dynamic.Runtime) = 4.0.0.0
Provides: mono(System.Globalization) = 4.0.0.0
Provides: mono(System.IO) = 4.0.0.0
@@ -163,7 +141,24 @@ Provides: mono(System.Linq.Queryable) = 4.0.0.0
Provides: mono(System.Net.NetworkInformation) = 4.0.0.0
Provides: mono(System.Net.Primitives) = 4.0.0.0
Provides: mono(System.Net.Requests) = 4.0.0.0
+Provides: mono(System.ObjectModel) = 4.0.0.0
+Provides: mono(System.Reflection) = 4.0.0.0
+Provides: mono(System.Reflection.Emit) = 4.0.0.0
+Provides: mono(System.Reflection.Emit.ILGeneration) = 4.0.0.0
+Provides: mono(System.Reflection.Emit.Lightweight) = 4.0.0.0
+Provides: mono(System.Reflection.Extensions) = 4.0.0.0
+Provides: mono(System.Reflection.Primitives) = 4.0.0.0
Provides: mono(System.Resources.ResourceManager) = 4.0.0.0
+Provides: mono(System.Runtime) = 4.0.0.0
+Provides: mono(System.Runtime.Extensions) = 4.0.0.0
+Provides: mono(System.Runtime.InteropServices) = 4.0.0.0
+Provides: mono(System.Runtime.InteropServices.WindowsRuntime) = 4.0.0.0
+Provides: mono(System.Runtime.Numerics) = 4.0.0.0
+Provides: mono(System.Runtime.Serialization.Json) = 4.0.0.0
+Provides: mono(System.Runtime.Serialization.Primitives) = 4.0.0.0
+Provides: mono(System.Runtime.Serialization.Xml) = 4.0.0.0
+Provides: mono(System.Security) = 1.0.5000.0
+Provides: mono(System.Security) = 2.0.0.0
Provides: mono(System.Security.Principal) = 4.0.0.0
Provides: mono(System.ServiceModel.Http) = 4.0.0.0
Provides: mono(System.ServiceModel.Primitives) = 4.0.0.0
@@ -175,10 +170,14 @@ Provides: mono(System.Threading) = 4.0.0.0
Provides: mono(System.Threading.Tasks) = 4.0.0.0
Provides: mono(System.Threading.Tasks.Parallel) = 4.0.0.0
Provides: mono(System.Threading.Timer) = 4.0.0.0
+Provides: mono(System.Xml) = 1.0.5000.0
+Provides: mono(System.Xml) = 2.0.0.0
+Provides: mono(System.Xml.ReaderWriter) = 4.0.0.0
+Provides: mono(System.Xml.XDocument) = 4.0.0.0
+Provides: mono(System.Xml.XmlSerializer) = 4.0.0.0
Provides: mono(mscorlib) = 1.0.5000.0
Provides: mono(mscorlib) = 2.0.0.0
Provides: mono(mscorlib) = 4.0.0.0
-Provides: mono(Mono.Configuration.Crypto) = 4.0.0.0
# mono-core provides System.DateTime functions, which rely on timezone information
Requires: timezone
@@ -346,6 +345,8 @@ rm -v %{buildroot}%{_bindir}/csc
rm -v %{buildroot}%{_bindir}/csi
rm -v %{buildroot}%{_bindir}/vbc
rm -rfv %{msbuild_prefix}
+# also remove stale symlinks to prevent from brp-25-symlink errors:
+rm -v %{buildroot}%{_prefix}/lib/mono/msbuild/Current/bin/Roslyn/*
%endif
%fdupes %{buildroot}%{_prefix}
@@ -571,7 +572,7 @@ cert-sync /etc/ssl/ca-bundle.pem
%package -n libmono-2_0-1
Summary: A Library for embedding Mono in your Application
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Libraries/C and C++
%if %{sgen}
Requires: libmonosgen-2_0-1
@@ -598,7 +599,7 @@ A Library for embedding Mono in your Application.
%package -n libmono-2_0-devel
Summary: Development files for libmono
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: libmono-2_0-1 = %{version}
%if %{sgen}
@@ -628,7 +629,7 @@ Development files for libmono.
%if %boehm == yes
%package -n libmonoboehm-2_0-1
Summary: A Library for embedding Mono in your Application (Boehm GC)
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Libraries/C and C++
%description -n libmonoboehm-2_0-1
@@ -651,7 +652,7 @@ Boehm garbage collector.
%package -n libmonoboehm-2_0-devel
Summary: Development files for libmonoboehm
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: libmono-2_0-devel
Requires: libmonoboehm-2_0-1 = %{version}
@@ -674,7 +675,7 @@ Development files for libmonoboehm
%if %sgen == yes
%package -n libmonosgen-2_0-1
Summary: A Library for embedding Mono in your Application (SGen GC)
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Libraries/C and C++
%description -n libmonosgen-2_0-1
@@ -697,7 +698,7 @@ garbage collector.
%package -n libmonosgen-2_0-devel
Summary: Development files for libmonosgen
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: libmono-2_0-devel
Requires: libmonosgen-2_0-1 = %{version}
@@ -722,7 +723,7 @@ Development files for libmonosgen.
%if %llvm == yes
%package -n libmono-llvm0
Summary: Loadable LLVM libary for mono
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Libraries/C and C++
%description -n libmono-llvm0
@@ -745,7 +746,7 @@ Loadable LLVM libary for mono.
%package -n mono-locale-extras
Summary: Extra locale information
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: mono-core = %{version}
Provides: mono(I18N.CJK) = 1.0.5000.0
@@ -779,7 +780,7 @@ Extra locale information.
%package -n mono-data
Summary: Database connectivity for Mono
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: mono-core = %{version}
Provides: mono-directory = %{version}
@@ -843,7 +844,7 @@ Database connectivity for Mono.
%package -n mono-winforms
Summary: Mono's Windows Forms implementation
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: mono-core = %{version}
Provides: mono-window-forms = %{version}
@@ -884,7 +885,7 @@ Mono's Windows Forms implementation.
%package -n ibm-data-db2
Summary: Database connectivity for DB2
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: mono-core = %{version}
@@ -904,7 +905,7 @@ Database connectivity for DB2.
%package -n mono-extras
Summary: Extra packages
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: mono-core = %{version}
Provides: mono-ms-extras = %{version}
@@ -969,7 +970,7 @@ Extra packages.
%package -n mono-data-sqlite
Summary: Database connectivity for Mono
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: mono-core = %{version}
Requires: mono-data = %{version}
@@ -992,7 +993,7 @@ Database connectivity for Mono.
%package -n mono-wcf
Summary: Mono implementation of WCF, Windows Communication Foundation
-License: MIT and MS-PL
+License: MIT AND MS-PL
Group: Development/Languages/Mono
Requires: mono-core = %{version}
@@ -1038,7 +1039,7 @@ Mono implementation of WCF, Windows Communication Foundation
%package -n mono-winfxcore
Summary: Mono implementation of core WinFX APIs
-License: MIT and MS-PL
+License: MIT AND MS-PL
Group: Development/Languages/Mono
Requires: mono-core = %{version}
@@ -1060,7 +1061,7 @@ Mono implementation of core WinFX APIs
%package -n mono-web
Summary: Mono implementation of ASP
-License: MIT and MS-PL
+License: MIT AND MS-PL
Group: Development/Languages/Mono
Requires: mono-core = %{version}
Provides: mono-remoting = %{version}
@@ -1166,7 +1167,7 @@ Mono implementation of ASP.NET, Remoting and Web Services.
%package -n mono-mvc
Summary: Mono implementation of ASP
-License: MIT and MS-PL
+License: MIT AND MS-PL
Group: Development/Languages/Mono
Requires: mono-core = %{version}
@@ -1197,7 +1198,7 @@ Mono implementation of ASP.NET MVC.
%package -n mono-data-oracle
Summary: Database connectivity for Mono
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: mono-core = %{version}
Requires: mono-data = %{version}
@@ -1220,7 +1221,7 @@ Database connectivity for Mono.
%package -n mono-devel
Summary: Mono development tools
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: libgdiplus-devel
Requires: mono-core = %{version}
@@ -1241,11 +1242,11 @@ Provides: mono(PEAPI) = 2.0.0.0
Provides: mono(resgen) = 1.0.5000.0
Provides: mono(resgen) = 2.0.0.0
#following 5 lines needed for a temporary build fix. According to https://github.com/mono/mono/commit/1f4133a06f252ec1b78637dd91e49f50836cf570, we shoud fix individual packages that rely on incorrect dependencies
-Provides: mono(System.ServiceModel) = 3.0.0.0
-Provides: mono(System.Core) = 3.5.0.0
Provides: mono(Mono.Posix) = 2.0.0.0
-Provides: mono(System.Transactions) = 2.0.0.0
Provides: mono(System.Configuration.Install) = 2.0.0.0
+Provides: mono(System.Core) = 3.5.0.0
+Provides: mono(System.ServiceModel) = 3.0.0.0
+Provides: mono(System.Transactions) = 2.0.0.0
%description -n mono-devel
The Mono Project is an open development initiative that is working to
@@ -1507,7 +1508,7 @@ Microsoft's Reactive Extensions.
%package -n monodoc-core
Summary: Monodoc - Documentation tools for C# code
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Tools/Other
Requires: mono-core = %{version}
# Added to uncompress and compare documentation used by build-compare
@@ -1556,7 +1557,7 @@ Monodoc-core contains documentation tools for C#.
%package -n mono-complete
Summary: Install everything built from the mono source tree
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: Development/Languages/Mono
Requires: ibm-data-db2 = %{version}
Requires: libmono-2_0-1 = %{version}
@@ -1587,8 +1588,8 @@ Requires: mono-winforms = %{version}
Requires: mono-winfxcore = %{version}
Requires: monodoc-core = %{version}
-Obsoletes: mono-entityframework < 4.0.0
Obsoletes: mono-data-postgresql < 4.0.0
+Obsoletes: mono-entityframework < 4.0.0
%description -n mono-complete
The Mono Project is an open development initiative that is working to