[mono-addins] Add patch to fix issues with pkglibdir

Peter Robinson pbrobinson at fedoraproject.org
Mon Apr 30 21:06:30 UTC 2012


commit 81073d3d564306966310a7fbb4eac2011e7f91b9
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Apr 30 22:06:20 2012 +0100

    Add patch to fix issues with pkglibdir

 automake_1.11.2_pkglibdir_workaround.patch |   13 +++++++++++++
 mono-addins.spec                           |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/automake_1.11.2_pkglibdir_workaround.patch b/automake_1.11.2_pkglibdir_workaround.patch
new file mode 100644
index 0000000..59d3a6f
--- /dev/null
+++ b/automake_1.11.2_pkglibdir_workaround.patch
@@ -0,0 +1,13 @@
+--- mono-addins-0.6.2/mautil/Makefile.am.orig	2012-04-30 21:19:16.662933710 +0100
++++ mono-addins-0.6.2/mautil/Makefile.am	2012-04-30 21:19:51.487818453 +0100
+@@ -36,8 +36,8 @@
+ 
+ include $(top_srcdir)/Makefile.include
+ 
+-pkglibdir = $(prefix)/lib/mono/mono-addins
+-pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
++programfilesdir = $(prefix)/lib/mono/mono-addins
++programfiles_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
+ 
+ man_MANS = mautil.1
+ EXTRA_DIST += $(man_MANS)
diff --git a/mono-addins.spec b/mono-addins.spec
index 0796a63..edc1903 100644
--- a/mono-addins.spec
+++ b/mono-addins.spec
@@ -2,13 +2,14 @@
 
 Name:		mono-addins
 Version:	0.6.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Addins for mono
 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
+Patch1:		automake_1.11.2_pkglibdir_workaround.patch
 
 BuildRequires:	mono-devel >= 2.4, gtk-sharp2-devel, autoconf, automake
 BuildRequires:	pkgconfig
@@ -53,6 +54,7 @@ using add-in references directly in a build file (still experimental).
 %prep
 %setup -q 
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .pkglibdir
 
 %build
 autoreconf -f -i
@@ -106,6 +108,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Mon Apr 30 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.6.2-5
+- Add patch to fix issues with pkglibdir
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list