From 480d4cbafaacec08ea9fe60d03b1f1380845ba6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 8 Apr 2024 21:24:08 +0200 Subject: [PATCH] Add workaround for borked autotools installation https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin Without this, build on a system with merged-sbin fails. [skip changelog] --- util-linux.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util-linux.spec b/util-linux.spec index 0042b1a..6cd737d 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -434,6 +434,11 @@ find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \ -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|uname26)\.8.*" \ -printf "%{_mandir}/man8/%f*\n" >> %{name}.files +%if "%{_sbindir}" == "%{_bindir}" +# Autotools installation script gets the location wrong :( +mv -v %{buildroot}/usr/sbin/* %{buildroot}/usr/bin/ +%endif + %post %systemd_post fstrim.{service,timer}