Use 4.5 not 2.0 for mono-find-provdes/depends

This commit is contained in:
Jo Shields 2015-04-09 12:54:47 +01:00
parent 13136919b6
commit f381d47c53
2 changed files with 28 additions and 2 deletions

26
fix-rpm-helpers.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index c921006..155690d 100644
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -33,7 +33,7 @@ fi
# set LD_LIBRARY_PATH to ensure that libmono is found
export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
# and set MONO_PATH to ensure that mscorlib.dll can be found
-export MONO_PATH=$prefix/lib/mono/2.0
+export MONO_PATH=$prefix/lib/mono/4.5
for i in "${monolist[@]}"; do
($bindir/monodis --assembly $i | awk '
diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
index f0ad60b..d7b6a32 100644
--- a/scripts/mono-find-requires.in
+++ b/scripts/mono-find-requires.in
@@ -50,7 +50,7 @@ esac
# set LD_LIBRARY_PATH to ensure that libmono is found
export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
# and set MONO_PATH to ensure that mscorlib.dll can be found
-export MONO_PATH=$prefix/lib/mono/2.0
+export MONO_PATH=$prefix/lib/mono/4.5
REQUIRES=$(
for i in "${monolist[@]}"; do

View File

@ -34,7 +34,7 @@ License: LGPL-2.1 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}~alpha1.tar.bz2
#Patch0: 0001-Workaround-for-X509Certificate.RSA-throwing-an-unhan.patch
Patch0: fix-rpm-helpers.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -118,7 +118,7 @@ technologies that have been submitted to the ECMA for standardization.
%prep
%setup -q -n mono-%{version}
#%patch0 -p1
%patch0 -p1
%build
./autogen.sh