rpm/mono-core
SHA256
1
0
Fork 0
forked from pool/mono-core
Code Pull Requests Activity

Accepting request 399579 from home:Warhammer40k:Mono:Factory

Browse Source 
Fix mono-find-requires and mono-find-provides scripts when invoking them in custom deps generation routines. This should fix deps generation in this packages: monodevelop and monodevelop-database

Add some missing deps. This should help with fixing some other mono packages and make them installable: upcoming monodevelop 6 (https://build.opensuse.org/package/show/home:Warhammer40k:Mono:Factory/monodevelop-beta), ironphyton, monodevelop-database and monodevelop-database-gdb

OBS-URL: https://build.opensuse.org/request/show/399579
OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=169
This commit is contained in:
Matthias Mailänder 2016-06-02 17:45:26 +00:00 committed by Git OBS Bridge
parent f504d7150e
commit dea8d50d01
3 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
find-deps-fix.patch Normal file
View File

@ -0,0 +1,24 @@
diff -uprN mono-4.2.3.old/scripts/mono-find-provides.in mono-4.2.3/scripts/mono-find-provides.in
--- mono-4.2.3.old/scripts/mono-find-provides.in 2016-03-15 14:31:53.000000000 +0300
+++ mono-4.2.3/scripts/mono-find-provides.in 2016-06-01 09:21:13.028703810 +0300
@@ -24,7 +24,7 @@ libdir=$prefix/@reloc_libdir@
bindir=$prefix/bin
# Bail out if monodis or libmono is missing
-if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono-2.0.so.1 ] ; then
+if [ ! -x $bindir/monodis ] ; then
echo "monodis missing or unusable, exiting..." 1>&2
exit 1
fi
diff -uprN mono-4.2.3.old/scripts/mono-find-requires.in mono-4.2.3/scripts/mono-find-requires.in
--- mono-4.2.3.old/scripts/mono-find-requires.in 2016-03-15 14:31:53.000000000 +0300
+++ mono-4.2.3/scripts/mono-find-requires.in 2016-06-01 09:21:25.876703594 +0300
@@ -28,7 +28,7 @@ libdir=$prefix/@reloc_libdir@
bindir=$prefix/bin
# Bail out if monodis or libmono is missing
-if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono-2.0.so.1 ] ; then
+if [ ! -x $bindir/monodis ] ; then
echo "monodis missing or unusable, exiting..." 1>&2
exit 1
fi

7
mono-core.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 2 00:00:00 UTC 2016 - fwdsbs.to.11df@xoxy.net
- added find-deps-fix.patch: remove libmono library check from mono-find-requires and mono-find-provides scrits to fix custom dependencies generator in other mono packages (that invoke this scripts directly)
- added missing provide-dependencies from /usr/lib/mono/4.5/Facades dir (that was removed at Nov 17 2015 changes)
- added System.Transactions and System.Configuration.Install provide-dependencies to mono-devel
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 17 12:43:59 UTC 2016 - mailaender@opensuse.org Sun Apr 17 12:43:59 UTC 2016 - mailaender@opensuse.org

56
mono-core.spec
View File

@ -51,6 +51,8 @@ Patch12: fix_exception_when_reading_from_timezone_file.patch
################## ##################
# PATCH-FIX-UPSTREAM https://github.com/mono/mono/pull/2394 # PATCH-FIX-UPSTREAM https://github.com/mono/mono/pull/2394
Patch13: libgdiplus0-un-devel.patch Patch13: libgdiplus0-un-devel.patch
# remove checks for libmono in mono-find-provides and mono-find-requires scripts
Patch14: find-deps-fix.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
@ -103,6 +105,55 @@ Provides: mono(System.Security) = 1.0.5000.0
Provides: mono(System.Security) = 2.0.0.0 Provides: mono(System.Security) = 2.0.0.0
Provides: mono(System.Xml) = 1.0.5000.0 Provides: mono(System.Xml) = 1.0.5000.0
Provides: mono(System.Xml) = 2.0.0.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
Provides: mono(System.Linq) = 4.0.0.0
Provides: mono(System.Linq.Expressions) = 4.0.0.0
Provides: mono(System.Linq.Parallel) = 4.0.0.0
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.Resources.ResourceManager) = 4.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
Provides: mono(System.ServiceModel.Security) = 4.0.0.0
Provides: mono(System.Text.Encoding) = 4.0.0.0
Provides: mono(System.Text.Encoding.Extensions) = 4.0.0.0
Provides: mono(System.Text.RegularExpressions) = 4.0.0.0
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(mscorlib) = 1.0.5000.0 Provides: mono(mscorlib) = 1.0.5000.0
Provides: mono(mscorlib) = 2.0.0.0 Provides: mono(mscorlib) = 2.0.0.0
Provides: mono(mscorlib) = 4.0.0.0 Provides: mono(mscorlib) = 4.0.0.0
@ -135,6 +186,7 @@ technologies that have been submitted to the ECMA for standardization.
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
%build %build
NOCONFIGURE="yes" ./autogen.sh NOCONFIGURE="yes" ./autogen.sh
@ -1041,10 +1093,12 @@ Provides: mono-biarchcompat = %{version}
%endif %endif
Provides: mono(PEAPI) = 1.0.5000.0 Provides: mono(PEAPI) = 1.0.5000.0
Provides: mono(resgen) = 1.0.5000.0 Provides: mono(resgen) = 1.0.5000.0
#following 3 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 #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.ServiceModel) = 3.0.0.0
Provides: mono(System.Core) = 3.5.0.0 Provides: mono(System.Core) = 3.5.0.0
Provides: mono(Mono.Posix) = 2.0.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
%description -n mono-devel %description -n mono-devel
The Mono Project is an open development initiative that is working to The Mono Project is an open development initiative that is working to