From e5f741536a440ca1c5c1ce39b82dbad43a6f0b05 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 14 Feb 2025 12:25:54 +0100 Subject: [PATCH] Packaging: Ensure sbindir is properly set on newer Fedora (42+) --- pkg/rpm/unit.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index fc3feb148..102232072 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -88,6 +88,7 @@ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \ %{CONFIGURE_ARGS} \ --modulesdir=%{_libdir}/unit/debug-modules \ --libdir=%{_libdir} \ + --sbindir=%{_sbindir} \ --cc-opt="%{CC_OPT}" \ --ld-opt="%{LD_OPT}" \ --debug @@ -151,6 +152,9 @@ DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install E=0 %{__rm} -rf %{buildroot}%{_initrddir}/ %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/unit.service %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/unit-debug.service +# relocate when sbindir is /usr/bin +sed -e 's:/usr/sbin:%{_sbindir}:' -i %{buildroot}%{_unitdir}/*.service + %if (0%{?fedora}) || (0%{?rhel} >= 8) || (0%{?amzn2}) %{__mkdir} -p %{buildroot}%{_includedir}/unit/