From 606bd9dedd8d8c55501cf089c7bd352259c7a3cd Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Thu, 4 Apr 2013 22:03:03 +0200 Subject: [PATCH] Fix FTBFS against latest automake Patch taken from upstream mono git, commit 052ba601f3ed9e7fc5a216407986a89ee0c3296f --- ...utomake-macros-obsoleted-by-automake-1.13.-F.patch | 11 +++++++++++ wine-mono.spec | 10 ++++++++++ 2 files changed, 21 insertions(+) create mode 100644 0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch diff --git a/0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch b/0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch new file mode 100644 index 0000000..c1342dd --- /dev/null +++ b/0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch @@ -0,0 +1,11 @@ +diff --git a/runtime/Makefile.am b/runtime/Makefile.am +index c12d4a7..f70d4d2 100644 +--- a/runtime/Makefile.am ++++ b/runtime/Makefile.am +@@ -1,6 +1,3 @@ +-# hack to prevent 'check' from depending on 'all' +-AUTOMAKE_OPTIONS = cygnus +- + tmpinst = _tmpinst + + noinst_SCRIPTS = mono-wrapper monodis-wrapper diff --git a/wine-mono.spec b/wine-mono.spec index 6351bbd..c282a22 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -12,6 +12,10 @@ Source0: http://sourceforge.net/projects/wine/files/Wine%20Mono/%{version Patch0: wine-mono-build-msifilename.patch Patch1: wine-mono-build-fixidtgeneration.patch +# Fix FTBFS against latest automake +# Patch taken from upstream mono git, commit 052ba601f3ed9e7fc5a216407986a89ee0c3296f +Patch2: 0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch + # see git://github.com/madewokherd/wine-mono BuildArch: noarch @@ -51,6 +55,9 @@ Windows Mono library required for Wine. %setup -q %patch0 -p1 -b.msifilename %patch1 -p1 -b.fixidtgen +cd mono +%patch2 -p1 -b .automake +cd - %build # make sure this builds on x86-64 @@ -94,6 +101,9 @@ cp MonoGame/LICENSE.txt MonoGame-LICENSE.txt %{_datadir}/wine/mono/wine-mono-%{version}.msi %changelog +* Thu Apr 4 2013 Erik van Pienbroek - 0.0.8-3 +- Fix FTBFS against latest automake + * Fri Feb 15 2013 Fedora Release Engineering - 0.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild