[mono-addins] fix build on i686:

[Christian Krause]

commit 86fa92b672de317dc7803836862d7c4a2120c7fb
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Tue Oct 25 21:40:51 2011 +0200

    fix build on i686:
    
    don't change global libdir, but fix Makefiles/configure

 mono-addins-0.6.2-libdir.patch |   38 ++++++++++++++++++++++++++++++++++++++
 mono-addins.spec               |    7 ++++---
 2 files changed, 42 insertions(+), 3 deletions(-)
---
diff --git a/mono-addins-0.6.2-libdir.patch b/mono-addins-0.6.2-libdir.patch
new file mode 100644
index 0000000..fa33d48
--- /dev/null
+++ b/mono-addins-0.6.2-libdir.patch
@@ -0,0 +1,38 @@
+diff -uNr mono-addins-0.6.2.old/configure.ac mono-addins-0.6.2/configure.ac
+--- mono-addins-0.6.2.old/configure.ac	2011-08-09 17:52:58.000000000 +0200
++++ mono-addins-0.6.2/configure.ac	2011-10-25 21:28:18.645867791 +0200
+@@ -33,8 +33,8 @@
+ 	AC_MSG_ERROR([No al tool found. You need to install either the mono or .Net SDK.])
+ fi
+ 
+-GACUTIL_FLAGS='/package mono-addins /root $(DESTDIR)$(libdir)'
+-GACUTIL_POLICY_FLAGS='/root $(DESTDIR)$(libdir)'
++GACUTIL_FLAGS='/package mono-addins /root $(DESTDIR)$(prefix)/lib'
++GACUTIL_POLICY_FLAGS='/root $(DESTDIR)$(prefix)/lib'
+ 
+ AC_SUBST(GACUTIL)
+ AC_SUBST(GACUTIL_FLAGS)
+diff -uNr mono-addins-0.6.2.old/mautil/Makefile.am mono-addins-0.6.2/mautil/Makefile.am
+--- mono-addins-0.6.2.old/mautil/Makefile.am	2011-08-09 17:52:58.000000000 +0200
++++ mono-addins-0.6.2/mautil/Makefile.am	2011-10-25 21:28:18.645867791 +0200
+@@ -36,7 +36,7 @@
+ 
+ include $(top_srcdir)/Makefile.include
+ 
+-pkglibdir = $(libdir)/mono/mono-addins
++pkglibdir = $(prefix)/lib/mono/mono-addins
+ pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
+ 
+ man_MANS = mautil.1
+diff -uNr mono-addins-0.6.2.old/Mono.Addins.MSBuild/Makefile.am mono-addins-0.6.2/Mono.Addins.MSBuild/Makefile.am
+--- mono-addins-0.6.2.old/Mono.Addins.MSBuild/Makefile.am	2011-08-09 17:52:58.000000000 +0200
++++ mono-addins-0.6.2/Mono.Addins.MSBuild/Makefile.am	2011-10-25 21:28:27.643877653 +0200
+@@ -39,7 +39,7 @@
+ 	mkdir -p $(dir $(ASSEMBLY))		
+ 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref)
+ 
+-xbuilddir = $(libdir)/mono/xbuild
++xbuilddir = $(prefix)/lib/mono/xbuild
+ xbuild_DATA = Mono.Addins.targets
+ 
+ install-data-local: gac-install
diff --git a/mono-addins.spec b/mono-addins.spec
index 281ac90..6f0d6c5 100644
--- a/mono-addins.spec
+++ b/mono-addins.spec
@@ -8,6 +8,7 @@ Group:		Development/Languages
 License:	MIT
 URL:		http://www.mono-project.com/Main_Page
 Source0:	http://origin-download.mono-project.com/sources/mono-addins/mono-addins-%{version}.tar.bz2
+Patch0:		mono-addins-0.6.2-libdir.patch
 
 BuildRequires:	mono-devel >= 2.4, gtk-sharp2-devel
 BuildRequires:	pkgconfig
@@ -51,15 +52,15 @@ using add-in references directly in a build file (still experimental).
 
 %prep
 %setup -q 
+%patch0 -p1 -b .libdir
 
 %build
-%configure --enable-gui --libdir=%{_prefix}/lib
+autoreconf -f -i
+%configure --enable-gui
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install
-mkdir -p %{buildroot}%{_libdir}/pkgconfig
-mv %{buildroot}%{_prefix}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig
 
 %files 
 %defattr(-,root,root,-)