From: Neal Gompa <ngompa13@gmail.com>
Date: Sun, 30 Aug 2020 00:09:18 +0000 (-0400)
Subject: rpm: Fix conditional for defining %_vpath_builddir for RHEL <= 7
X-Git-Tag: v6.8.0-rc1~343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab02e1d5e1100723bbbd4bad82dd4515d61daa62;p=thirdparty%2Flibvirt.git

rpm: Fix conditional for defining %_vpath_builddir for RHEL <= 7

The conditional was incorrectly overriding %_vpath_builddir when
%rhel is not defined, which led to surprising behavior when the
global %_vpath_builddir path is set on Fedora already.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
Message-Id: <20200830000918.11431-1-ngompa13@gmail.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index bb74443484..4b9e04ae61 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -32,7 +32,7 @@
 %endif
 
 # On RHEL 7 and older macro _vpath_builddir is not defined.
-%if 0%{?rhel} <= 7
+%if 0%{?rhel} && 0%{?rhel} <= 7
     %define _vpath_builddir %{_target_platform}
 %endif