From e0cfcc0fc76a7642faabb25c5e348d6a1314ace2 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 10 Jul 2021 09:43:26 -0400 Subject: [PATCH] Make vpath builddir not include arch-specific info A number of cases have cropped up where things like documentation builds fail with out of tree builds because tools like Doxygen like encoding the build path into the documentation metadata. This causes failures in Koji and other places where noarch documentation subpackages from archful packages fail because they fail the comparison check due to this. --- macros.vpath | 2 +- redhat-rpm-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros.vpath b/macros.vpath index a37f1f9..93723a2 100644 --- a/macros.vpath +++ b/macros.vpath @@ -4,4 +4,4 @@ %_vpath_srcdir . # directory (doesn't need to exist) where all generated build files will be placed -%_vpath_builddir %_target_platform +%_vpath_builddir %{_vendor}-%{_target_os}-build diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index e620563..f6fa182 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 191 +Version: 192 Release: 1%{?dist} # No version specified. License: GPL+ @@ -213,6 +213,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Sat Jul 10 2021 Neal Gompa - 192-1 +- Make vpath builddir not include arch-specific info + * Thu Jul 01 2021 Miro Hrončok - 191-1 - Require python-srpm-macros with Python related BuildRoot Policy scripts