mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for 4.0.1 release

Browse Source
This commit is contained in:
Jo Shields 2015-04-27 08:30:46 +01:00
parent f381d47c53
commit 15498c8990
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fix-rpm-helpers.patch
View File

@ -1,26 +0,0 @@
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

12
mono-core.spec
View File

@ -27,14 +27,14 @@
%define sgen yes
Name: mono-core
Version: 4.0.0
Release: 0.alpha1.0
Version: 4.0.1
Release: 1
Summary: Cross-platform, Open Source, .NET development framework
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: fix-rpm-helpers.patch
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
#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
@ -1106,6 +1106,8 @@ Mono development tools.
%{_mandir}/man1/xbuild.1%ext_man
%{_prefix}/lib/mono-source-libs
%{_prefix}/lib/mono/4.0
%{_prefix}/lib/mono/3.5
%{_prefix}/lib/mono/2.0
%{_prefix}/lib/mono/4.5/Microsoft.Build.dll
%{_prefix}/lib/mono/4.5/Microsoft.Build.Engine.dll
%{_prefix}/lib/mono/4.5/Microsoft.Build.Framework.dll