[mono-basic] Change paths for mono assemblies according to updated packaging guidelines (http://fedoraproject.org

[Christian Krause]

commit 824bd38205f9de8792567f04764837354bf91402
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Oct 24 00:17:26 2011 +0200

    Change paths for mono assemblies according to updated packaging
    guidelines (http://fedoraproject.org/wiki/Packaging:Mono)

 mono-basic.patch |   17 -----------------
 mono-basic.spec  |   46 ++++++++++++++++++----------------------------
 2 files changed, 18 insertions(+), 45 deletions(-)
---
diff --git a/mono-basic.spec b/mono-basic.spec
index 9b3c43a..4ccbce1 100644
--- a/mono-basic.spec
+++ b/mono-basic.spec
@@ -2,14 +2,12 @@
 
 Name:		mono-basic
 Version:	2.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	VisualBasic.NET support for mono
 Group:		Development/Languages
 License:	LGPLv2+
-Patch0:		mono-basic.patch
 URL:		http://www.mono-project.com/Main_Page
-Source0:	http://ftp.novell.com/pub/mono/sources/mono-basic/%{name}-%{version}.tar.bz2	
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://origin-download.mono-project.com/sources/mono-basic/%{name}-%{version}.tar.bz2	
 
 # Yeah, so this guy isn't self-hosting.
 %ifarch !ppc
@@ -37,48 +35,36 @@ Development files for mono-basic
 
 %prep
 %setup -q
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
-%patch0 -p1 -b .original
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0} 
-sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' build/config-default.make
-sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' build/profiles/net_4_0.make
-sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' build/profiles/net_2_0.make
-sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' configure
-# Get rid of bootstrap binary bits
 
 %build
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
-make libdir=%{_libdir}
+./configure --prefix=%{_prefix} --libdir=%{_prefix}/lib
+make
 
 %install
-%{__rm} -rf %{buildroot}
-make libdir=%{_libdir} DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig
 
 cat <<EOF >%{buildroot}/%{_libdir}/pkgconfig/mono-basic.pc
 prefix=%{_prefix}
 exec_prefix=%{_prefix}
-libdir=%{_libdir}
+libdir=%{_prefix}/lib
 
 Name: mono-basic
 Description: mono-basic - VB for mono
 Version: 2.0
-Libs: -r:%{_libdir}/mono/2.0/Microsoft.VisualBasic.dll
+Libs: -r:%{_prefix}/lib/mono/2.0/Microsoft.VisualBasic.dll
 EOF
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files 
 %defattr(-,root,root,-)
 %{_bindir}/vbnc*
-%{_libdir}/mono/?.0/vbnc*
-%{_libdir}/mono/?.0/Microsoft.VisualBasic.dll
-%{_libdir}/mono/gac/Microsoft.VisualBasic
-%{_libdir}/mono/?.0/Mono.Cecil.VB*dll
-%{_libdir}/mono/gac/Mono.Cecil.VB.Mdb
-%{_libdir}/mono/gac/Mono.Cecil.VB.Pdb
-%{_libdir}/mono/gac/Mono.Cecil.VB
+%{_prefix}/lib/mono/?.0/vbnc*
+%{_prefix}/lib/mono/?.0/Microsoft.VisualBasic.dll
+%{_prefix}/lib/mono/gac/Microsoft.VisualBasic
+%{_prefix}/lib/mono/?.0/Mono.Cecil.VB*dll
+%{_prefix}/lib/mono/gac/Mono.Cecil.VB.Mdb
+%{_prefix}/lib/mono/gac/Mono.Cecil.VB.Pdb
+%{_prefix}/lib/mono/gac/Mono.Cecil.VB
 %{_mandir}/man1/vbnc.*
 
 %files devel
@@ -86,6 +72,10 @@ EOF
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
+* Sun Oct 23 2011 Christian Krause <chkr at fedoraproject.org> - 2.10-3
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Thu Jun 02 2011 Paul Whalen <paul.whalen at senecac.on.ca> - 2.10-2
 - Added arm macro to ExclusiveArch