From de8348178796dc25edcb9396e1d28e27bc0af98c Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Apr 25 2024 14:17:45 +0000 Subject: Unconditionally run autoreconf --- diff --git a/libguestfs.spec b/libguestfs.spec index 37bf6fe..3987f3e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -29,14 +29,6 @@ ExcludeArch: %{ix86} # Verify tarball signature with GPGv2. %global verify_tarball_signature 1 -# If there are patches which touch autotools files, set this to 1. -%if !0%{?rhel} -%global patches_touch_autotools %{nil} -%else -# On RHEL the downstream patches always touch autotools files. -%global patches_touch_autotools 1 -%endif - # The source directory. %global source_directory 1.52-stable @@ -84,9 +76,7 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -%if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel -%endif # Basic build requirements. BuildRequires: gcc, gcc-c++ @@ -696,9 +686,7 @@ for %{name}. %setup -q %autopatch -p1 -%if 0%{patches_touch_autotools} -autoreconf -i -%endif +autoreconf -fiv # For sVirt to work, the local temporary directory we use in the tests # must be labelled the same way as /tmp. This doesn't work if either