From 70aa55152e76ea1c93a27bdb789aab22fc12488e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 13 Apr 2024 13:47:02 +0200
Subject: [PATCH] Do not use macros is file path Requires

This is in preparation for
https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin.

When the package is rebuilt with a different %_sbindir (in particular
%_sbindir==%_bindir), those BuildRequires and Requires will stop working
with the providers of those requires that were built with the old definition.
We don't want to force a transition of all packages at the same time,
so instead use a fixed path. (The providers, when they are updated to
the new path, will retain a compat Provides for the old path.)

The tests fail in test-tar-xz-curl, but this doesn't seem to be
related to the path changes, but instead something about fs internals.

(cherry picked from commit 86fa43d05eb96c722fa2e79ce92edf5cdf0ee997)
---
 nbdkit.spec | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index e23c8f8..32781c2 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -143,25 +143,25 @@ BuildRequires:  gnupg2
 %endif
 
 # Only for running the test suite:
-BuildRequires:  %{_bindir}/bc
-BuildRequires:  %{_bindir}/certtool
-BuildRequires:  %{_bindir}/cut
+BuildRequires:  /usr/bin/bc
+BuildRequires:  /usr/bin/certtool
+BuildRequires:  /usr/bin/cut
 BuildRequires:  expect
-BuildRequires:  %{_bindir}/hexdump
-BuildRequires:  %{_sbindir}/ip
+BuildRequires:  /usr/bin/hexdump
+BuildRequires:  /usr/sbin/ip
 BuildRequires:  jq
-BuildRequires:  %{_bindir}/nbdcopy
-BuildRequires:  %{_bindir}/nbdinfo
-BuildRequires:  %{_bindir}/nbdsh
-BuildRequires:  %{_bindir}/qemu-img
-BuildRequires:  %{_bindir}/qemu-io
-BuildRequires:  %{_bindir}/qemu-nbd
-BuildRequires:  %{_sbindir}/sfdisk
+BuildRequires:  /usr/bin/nbdcopy
+BuildRequires:  /usr/bin/nbdinfo
+BuildRequires:  /usr/bin/nbdsh
+BuildRequires:  /usr/bin/qemu-img
+BuildRequires:  /usr/bin/qemu-io
+BuildRequires:  /usr/bin/qemu-nbd
+BuildRequires:  /usr/sbin/sfdisk
 %if !0%{?rhel}
-BuildRequires:  %{_bindir}/socat
+BuildRequires:  /usr/bin/socat
 %endif
-BuildRequires:  %{_sbindir}/ss
-BuildRequires:  %{_bindir}/stat
+BuildRequires:  /usr/sbin/ss
+BuildRequires:  /usr/bin/stat
 
 # This package has RPM rules that create the automatic Provides: for
 # nbdkit plugins and filters.  This means nbdkit build depends on
@@ -316,7 +316,7 @@ for %{name}.
 Summary:        Write small inline C plugins and scripts for %{name}
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       gcc
-Requires:       %{_bindir}/cat
+Requires:       /usr/bin/cat
 
 %description cc-plugin
 This package contains support for writing inline C plugins and scripts