From 592dfe0cd1fc58e6e1a03b3969c2eb2dc61e40e1 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 2 Dec 2021 08:56:57 -0500 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. Reference commit: https://src.fedoraproject.org/rpms/redhat-rpm-config/c/e0cfcc0fc76a7642faabb25c5e348d6a1314ace2 Resolves: rhbz#1984679 Signed-off-by: Neal Gompa --- macros.vpath | 2 +- redhat-rpm-config.spec | 6 +++++- 2 files changed, 6 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 94a00e0..3921bca 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: 189 +Version: 190 Release: 1%{?dist} # No version specified. License: GPL+ @@ -189,6 +189,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Thu Dec 02 2021 Neal Gompa - 190-1 +- Make vpath builddir not include arch-specific info + Resolves: rhbz#1984679 + * Tue Nov 16 2021 Florian Weimer - 189-1 - buildflags.md: Documentation updates (#2005080)