| |
@@ -570,13 +570,10 @@
|
| |
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
|
| |
install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
|
| |
|
| |
- pushd ${RPM_BUILD_ROOT}%{_sbindir}
|
| |
+ %if "%{_sbindir}" != "%{_bindir}"
|
| |
# Compatibility with previous major versions, only for selected binaries
|
| |
- for BIN in named-checkconf named-checkzone named-compilezone
|
| |
- do
|
| |
- ln -s ../bin/$BIN $BIN
|
| |
- done
|
| |
- popd
|
| |
+ ln -s ../bin/{named-checkconf,named-checkzone,named-compilezone} %{buildroot}%{_sbindir}/
|
| |
+ %endif
|
| |
|
| |
%if %{with DLZ}
|
| |
pushd build
|
| |
@@ -784,7 +781,9 @@
|
| |
%{_bindir}/mdig
|
| |
%{_sbindir}/named
|
| |
%{_sbindir}/rndc*
|
| |
+ %if "%{_sbindir}" != "%{_bindir}"
|
| |
%{_sbindir}/named-checkconf
|
| |
+ %endif
|
| |
%{_libexecdir}/generate-rndc-key.sh
|
| |
%{_libexecdir}/setup-named-softhsm.sh
|
| |
%{_mandir}/man1/mdig.1*
|
| |
@@ -850,8 +849,10 @@
|
| |
%{_bindir}/nsec3hash
|
| |
%{_bindir}/named-checkzone
|
| |
%{_bindir}/named-compilezone
|
| |
+ %if "%{_sbindir}" != "%{_bindir}"
|
| |
%{_sbindir}/named-checkzone
|
| |
%{_sbindir}/named-compilezone
|
| |
+ %endif
|
| |
%if %{with DNSTAP}
|
| |
%{_bindir}/dnstap-read
|
| |
%{_mandir}/man1/dnstap-read.1*
|
| |
zbyszek
commented a month ago
Preparation for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin.
No change in builds with unmerged sbin.