Skip to content

Commit e5f7415

Browse files
committed
Packaging: Ensure sbindir is properly set on newer Fedora (42+)
1 parent 7a0addd commit e5f7415

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Diff for: pkg/rpm/unit.spec.in

+4
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \
8888
%{CONFIGURE_ARGS} \
8989
--modulesdir=%{_libdir}/unit/debug-modules \
9090
--libdir=%{_libdir} \
91+
--sbindir=%{_sbindir} \
9192
--cc-opt="%{CC_OPT}" \
9293
--ld-opt="%{LD_OPT}" \
9394
--debug
@@ -151,6 +152,9 @@ DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install E=0
151152
%{__rm} -rf %{buildroot}%{_initrddir}/
152153
%{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/unit.service
153154
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/unit-debug.service
155+
# relocate when sbindir is /usr/bin
156+
sed -e 's:/usr/sbin:%{_sbindir}:' -i %{buildroot}%{_unitdir}/*.service
157+
154158

155159
%if (0%{?fedora}) || (0%{?rhel} >= 8) || (0%{?amzn2})
156160
%{__mkdir} -p %{buildroot}%{_includedir}/unit/

0 commit comments

Comments
 (0)