From b6d25c08f70d3b978378f89aeffccbc143230312 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 17 Jan 2013 12:52:24 +0000 Subject: [PATCH] Add very ugly workaround for a bug in automake 1.13.1. New automake breaks when TESTS variable contains GNU make macros such as $(sort ...). This affects ocaml/Makefile.am. I filed a bug about this which should appear here at some point: http://lists.gnu.org/archive/html/bug-automake/2013-01/threads.html --- libguestfs.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 3ef5547..c02cd93 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.21.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -674,8 +674,17 @@ if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then fi %if 0%{?fedora} >= 17 +%if 0%{?fedora} >= 19 +# Very ugly workaround for a bug in automake 1.13.1: +cp ocaml/Makefile.in ocaml/Makefile.in.bak +%endif %patch1 -p1 autoreconf -i +%if 0%{?fedora} >= 19 +# Very ugly workaround for a bug in automake 1.13.1: +cp ocaml/Makefile.in.bak ocaml/Makefile.in +touch ocaml/Makefile.in +%endif %endif mkdir -p daemon/m4 @@ -1018,7 +1027,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs %changelog -* Thu Jan 17 2013 Richard W.M. Jones - 1:1.21.3-1 +* Thu Jan 17 2013 Richard W.M. Jones - 1:1.21.3-2 - New upstream version 1.21.3. * Sat Jan 12 2013 Richard W.M. Jones - 1:1.21.2-3