PR#11: Fix build when %_bindir==%_sbindir - rpms/initscripts

Zbigniew Jędrzejewski-Szmek • 3 months ago

2f87c56

initscripts.spec

file modified

+6 -1

		`@@ -244,6 +244,11 @@`
		`touch %{buildroot}%{_sbindir}/ifup`
		`touch %{buildroot}%{_sbindir}/ifdown`

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

		`%post`
		`@@ -322,7 +327,7 @@`

		`# ---------------`

		`- %{_bindir}/*`
		`+ %{_bindir}/usleep`
		`%{_sbindir}/consoletype`
		`%{_sbindir}/genhostid`

Preparation for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin.
The glob in %files wase causing a warning about duplicate entries in
%files.