Skip to content

Commit aafbdfa

Browse files
keszybzmergify[bot]
authored andcommitted
Fix build when %_bindir==%_sbindir
Preparation for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin. The glob in %files wase causing a warning about duplicate entries in %files.
1 parent 5340406 commit aafbdfa

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

initscripts.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,11 @@ ln -sr %{_mandir}/man8/ifup.8 %{buildroot}%{_mandir}/man8/ifdown.8
244244
touch %{buildroot}%{_sbindir}/ifup
245245
touch %{buildroot}%{_sbindir}/ifdown
246246

247+
%if "%{_sbindir}" == "%{_bindir}"
248+
# Some files get installed wrong, but if $(sbindir) is overriden, the build fails :(
249+
mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
250+
%endif
251+
247252
# =============================================================================
248253

249254
%post
@@ -322,7 +327,7 @@ fi
322327

323328
# ---------------
324329

325-
%{_bindir}/*
330+
%{_bindir}/usleep
326331
%{_sbindir}/consoletype
327332
%{_sbindir}/genhostid
328333

0 commit comments

Comments
 (0)