From 7d49b086509b47ff192f76310816095992fc498865c1daef5498150eba18efcc Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 19 Nov 2012 17:28:37 +0000 Subject: [PATCH] - readd autoreconf -fi if automake is newer than 1.10 it fixes ruby build failures due to RPATH ending up in libraries in 11.4 and 12.1 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=159 --- libguestfs.changes | 7 +++++++ libguestfs.spec | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 5329016..17ba878 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 19 18:26:16 CET 2012 - ohering@suse.de + +- readd autoreconf -fi if automake is newer than 1.10 + it fixes ruby build failures due to RPATH ending up in libraries + in 11.4 and 12.1 + ------------------------------------------------------------------- Mon Nov 19 17:24:19 CET 2012 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 02e2b51..493c900 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -53,6 +53,8 @@ # Name: libguestfs ExclusiveArch: %ix86 x86_64 +BuildRequires: autoconf +BuildRequires: automake BuildRequires: aaa_base BuildRequires: attr-devel BuildRequires: augeas-devel @@ -387,6 +389,15 @@ else CFLAGS="$CFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" CXXFLAGS="$CXXFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" fi +am_version="`automake --version | awk '/^automake \(GNU automake\) / { print $4 }'`" +if test -n "${am_version}" +then + case "${am_version}" in + 1.10) ;; + 1.10.*) ;; + *) autoreconf -fi ;; + esac +fi # %configure \ --help || : @@ -438,7 +449,9 @@ grep "%perl_vendorarch/" %{name}.files | tee t mv t %{name}.files %endif # -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{l,}a +find $RPM_BUILD_ROOT -name "*.la" -print -delete +rm -fv $RPM_BUILD_ROOT/%{_libdir}/*.a +# touch %{name}.lang %find_lang %{name} #