summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-02-14 12:25:54 +0100
committerAndrew Clayton <a.clayton@nginx.com>2025-08-18 21:08:37 +0100
commit29dc400e38c8fb76cb53b7ab5d4a8a2fdd946b2d (patch)
treefeb8ac810f4ff2a742b13964cfd2339ae45a88f5
parentf682580e918cfe3e99f33cad6578204719b628e0 (diff)
downloadunit-29dc400e38c8fb76cb53b7ab5d4a8a2fdd946b2d.tar.gz
unit-29dc400e38c8fb76cb53b7ab5d4a8a2fdd946b2d.tar.bz2
Packaging: Ensure sbindir is properly set on newer Fedora (42+)
-rw-r--r--pkg/rpm/unit.spec.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index fc3feb14..10223207 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/