[rpms/bind] rawhide: Use subdirectory in helper services too

[rpms/bind] rawhide: Use subdirectory in helper services too

[@ 2026-07-01 9:47 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/bind
            Branch : rawhide
            Commit : 743cc89bef3cab7a83d58c9763800e50ac717fe6
            Author : Petr Menšík <pemensik@redhat.com>
            Date   : 2026-06-24T15:26:20+02:00
            Stats  : +19/-17 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/bind/c/743cc89bef3cab7a83d58c9763800e50ac717fe6?branch=rawhide

            Log:
            Use subdirectory in helper services too

Fixed with actually building version

---
diff --git a/bind.spec b/bind.spec
index 2b6eb76..4950e2f 100644
--- a/bind.spec
+++ b/bind.spec
@@ -590,23 +590,25 @@ rm -f ${RPM_BUILD_ROOT}/etc/bind.keys
 
 # Systemd unit files
 mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE37} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE38} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE44} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE46} ${RPM_BUILD_ROOT}%{_unitdir}
+install -p -m 644 %{SOURCE37} ${RPM_BUILD_ROOT}%{_unitdir}
+install -p -m 644 %{SOURCE38} ${RPM_BUILD_ROOT}%{_unitdir}
+install -p -m 644 %{SOURCE44} ${RPM_BUILD_ROOT}%{_unitdir}
+install -p -m 644 %{SOURCE46} ${RPM_BUILD_ROOT}%{_unitdir}
+
+sed -e "s|\%{name}|%{name}|" -i ${RPM_BUILD_ROOT}%{_unitdir}/named-*.service
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysusersdir}
-install -m 644 %{SOURCE50} ${RPM_BUILD_ROOT}%{_sysusersdir}/named.conf
+install -p -m 644 %{SOURCE50} ${RPM_BUILD_ROOT}%{_sysusersdir}/%{name}.conf
 
 mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
-install -m 755 %{SOURCE41} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/setup-named-chroot.sh
-install -m 755 %{SOURCE42} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/generate-rndc-key.sh
-install -m 755 %{SOURCE48} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/setup-named-softhsm.sh
+install -p -m 755 %{SOURCE41} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/setup-named-chroot.sh
+install -p -m 755 %{SOURCE42} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/generate-rndc-key.sh
+install -p -m 755 %{SOURCE48} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/setup-named-softhsm.sh
 
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
-install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
+install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
+install -p -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
 
 %if "%{_sbindir}" != "%{_bindir}"
 # Compatibility with previous major versions, only for selected binaries
@@ -637,7 +639,7 @@ pushd ${RPM_BUILD_ROOT}%{_mandir}/man1
 ln -s named-checkzone%{program_suffix}.1.gz named-compilezone%{program_suffix}.1.gz
 popd
 pushd ${RPM_BUILD_ROOT}%{_mandir}/man5
-  mv named.conf%{program_suffix}.5.gz named.conf.5.gz
+  mv named.conf%{program_suffix}.5 named.conf.5
 popd
 
 %if %{with DOC}
@@ -812,8 +814,8 @@ fi;
 %if "%{_sbindir}" != "%{_bindir}"
 %{_sbindir}/named-checkconf%{program_suffix}
 %endif
-%{_libexecdir}/generate-rndc-key.sh
-%{_libexecdir}/setup-named-softhsm.sh
+%{_libexecdir}/%{name}/generate-rndc-key.sh
+%{_libexecdir}/%{name}/setup-named-softhsm.sh
 %{_mandir}/man1/mdig%{program_suffix}.1*
 %{_mandir}/man1/named-rrchecker%{program_suffix}.1*
 %{_mandir}/man5/named.conf.5*
@@ -929,7 +931,7 @@ fi;
 %config(noreplace) %{_sysconfdir}/named-chroot.files
 %{_unitdir}/named-chroot.service
 %{_unitdir}/named-chroot-setup.service
-%{_libexecdir}/setup-named-chroot.sh
+%{_libexecdir}/%{name}/setup-named-chroot.sh
 %{_tmpfilesdir}/%{name}-chroot.conf
 %defattr(0664,root,named,-)
 %ghost %dev(c,1,3) %verify(not mtime) %{chroot_prefix}/dev/null

diff --git a/named-chroot-setup.service b/named-chroot-setup.service
index 237a909..1aae6e4 100644
--- a/named-chroot-setup.service
+++ b/named-chroot-setup.service
@@ -8,5 +8,5 @@ After=named-setup-rndc.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/libexec/setup-named-chroot.sh /var/named/chroot on /etc/named-chroot.files
-ExecStop=/usr/libexec/setup-named-chroot.sh /var/named/chroot off /etc/named-chroot.files
+ExecStart=/usr/libexec/%{name}/setup-named-chroot.sh /var/named/chroot on /etc/named-chroot.files
+ExecStop=/usr/libexec/%{name}/setup-named-chroot.sh /var/named/chroot off /etc/named-chroot.files

diff --git a/named-setup-rndc.service b/named-setup-rndc.service
index ff85e3c..9abab08 100644
--- a/named-setup-rndc.service
+++ b/named-setup-rndc.service
@@ -4,4 +4,4 @@ Description=Generate rndc key for BIND (DNS)
 [Service]
 Type=oneshot
 
-ExecStart=/usr/libexec/generate-rndc-key.sh
+ExecStart=/usr/libexec/%{name}/generate-rndc-key.sh