rpms/bind
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make binaries contain minor version

Browse source
This commit is contained in:
Petr Menšík 2026-04-30 19:49:10 +02:00
commit 139ee8b90d
2 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
0001-Use-variable-PROGRAM_SUFFIX-in-install-target.patch
View file

@ -1,4 +1,4 @@
From 31bd3a0996a85c0fced0c6ace3da1241b30dc397 Mon Sep 17 00:00:00 2001
From 7572e9ebfea2b92a750c2d4c5e83e3a15558cc8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Thu, 30 Apr 2026 17:28:40 +0200
Subject: [PATCH] Use variable PROGRAM_SUFFIX in install target
@ -13,7 +13,7 @@ versions installable together on a single system.
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile.top b/Makefile.top
index e186d15..91c076b 100644
index da95a2d..9ced320 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
@ -22,13 +22,13 @@ index e186d15..91c076b 100644
LDADD =
+PROGRAM_SUFFIX =
if HOST_MACOS
AM_LDFLAGS += \
BUILT_SOURCES =
CLEANFILES =
diff --git a/bin/check/Makefile.am b/bin/check/Makefile.am
index 8f63c35..36f232c 100644
index c25dc4d..2e9261e 100644
--- a/bin/check/Makefile.am
+++ b/bin/check/Makefile.am
@@ -27,8 +27,8 @@ LDADD += \
@@ -25,8 +25,8 @@ LDADD += \
bin_PROGRAMS = named-checkconf named-checkzone
install-exec-hook:

40
bind.spec
View file

@ -385,6 +385,7 @@ in HTML and PDF format.
# use this suffix for binaries
%global program_suffix -%{mver}
# preparation scripts directory
%global bind_libexecdir %{_libexecdir}/%{name}
@ -628,14 +629,14 @@ install -p -m 644 *.service "${RPM_BUILD_ROOT}%{_unitdir}"
mkdir -p ${RPM_BUILD_ROOT}%{_sysusersdir}
install -p -m 644 %{SOURCE50} ${RPM_BUILD_ROOT}%{_sysusersdir}/%{name}.conf
mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
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
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
install -pm 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/named
mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
install -pm 755 %{SOURCE41} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/setup-named-chroot.sh
install -pm 755 %{SOURCE42} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/generate-rndc-key.sh
install -pm 755 %{SOURCE48} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/setup-named-softhsm.sh
install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
@ -679,6 +680,9 @@ popd
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 named.conf.5
popd
%if %{with DOC}
mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
@ -703,7 +707,7 @@ cp -p doc/arm/_build/latex/Bv9ARM.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir}
%endif
# configuration files:
install -m 640 %{SOURCE16} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.conf
install -m 640 %{SOURCE16} ${RPM_BUILD_ROOT}%{_sysconfdir}/named%{program_suffix}.conf
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.{key,conf}
install -m 644 %{SOURCE27} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.root.key
install -m 644 %{SOURCE36} ${RPM_BUILD_ROOT}%{_sysconfdir}/trusted-key.key
@ -1067,6 +1071,8 @@ fi;
%endif
%{_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*
%ghost %attr(0755,-,-) %{_libexecdir}/generate-rndc-key.sh
# man pages
%{_mandir}/man1/mdig%{program_suffix}.1*
@ -1076,6 +1082,12 @@ fi;
%{_mandir}/man5/named.conf%{program_suffix}.5*
%{_mandir}/man5/rndc.conf%{program_suffix}.5*
%{_mandir}/man8/rndc%{program_suffix}.8*
%{_mandir}/man5/rndc.conf%{program_suffix}.5*
%{_mandir}/man8/rndc%{program_suffix}.8*
%{_mandir}/man8/named%{program_suffix}.8*
%{_mandir}/man1/named-checkconf%{program_suffix}.1*
%{_mandir}/man8/rndc-confgen%{program_suffix}.8*
%{_mandir}/man1/named-journalprint%{program_suffix}.1*
%{_mandir}/man8/named%{program_suffix}.8*
%{_mandir}/man8/rndc-confgen%{program_suffix}.8*
%{_mandir}/man8/filter-{a,aaaa}%{program_suffix}.8*
@ -1096,7 +1108,7 @@ fi;
# Hide configuration
%defattr(0640,root,named,0750)
%dir %{_sysconfdir}/named
%config(noreplace) %verify(not link) %{_sysconfdir}/named.conf
%config(noreplace) %verify(not link) %{_sysconfdir}/named%{program_suffix}.conf
%config(noreplace) %verify(not link) %{_sysconfdir}/named.rfc1912.zones
%defattr(0660,root,named,01770)
%dir %{_localstatedir}/named
@ -1130,16 +1142,16 @@ fi;
%files utils
%{_bindir}/arpaname%{program_suffix}
%{_bindir}/delv%{program_suffix}
%{_bindir}/dig%{program_suffix}
%{_bindir}/delv%{program_suffix}
%{_bindir}/host%{program_suffix}
%{_bindir}/nsec3hash%{program_suffix}
%{_bindir}/nslookup%{program_suffix}
%{_bindir}/nsupdate%{program_suffix}
%{_bindir}/named-checkzone%{program_suffix}
%{_bindir}/named-compilezone%{program_suffix}
%{_sbindir}/ddns-confgen%{program_suffix}
%{_sbindir}/tsig-keygen%{program_suffix}
%{_bindir}/nsec3hash%{program_suffix}
%{_bindir}/named-checkzone%{program_suffix}
%{_bindir}/named-compilezone%{program_suffix}
%ghost %attr(0755,-,-) %{_bindir}/arpaname
%ghost %attr(0755,-,-) %{_bindir}/delv
%ghost %attr(0755,-,-) %{_bindir}/dig
@ -1152,8 +1164,8 @@ fi;
%ghost %attr(0755,-,-) %{_sbindir}/ddns-confgen
%ghost %attr(0755,-,-) %{_sbindir}/tsig-keygen
%if "%{_sbindir}" != "%{_bindir}"
%{_sbindir}/named-checkzone
%{_sbindir}/named-compilezone
%{_sbindir}/named-checkzone%{program_suffix}
%{_sbindir}/named-compilezone%{program_suffix}
%endif
%if %{with DNSTAP}
%{_bindir}/dnstap-read%{program_suffix}
@ -1173,11 +1185,11 @@ fi;
%{_mandir}/man1/host%{program_suffix}.1*
%{_mandir}/man1/nslookup%{program_suffix}.1*
%{_mandir}/man1/nsupdate%{program_suffix}.1*
%{_mandir}/man8/ddns-confgen%{program_suffix}.8*
%{_mandir}/man8/tsig-keygen%{program_suffix}.8*
%{_mandir}/man1/nsec3hash%{program_suffix}.1*
%{_mandir}/man1/named-checkzone%{program_suffix}.1*
%{_mandir}/man1/named-compilezone%{program_suffix}.1*
%{_mandir}/man8/ddns-confgen%{program_suffix}.8*
%{_mandir}/man8/tsig-keygen%{program_suffix}.8*
%ghost %attr(0644,-,-) %{_mandir}/man1/arpaname.1%{manext}
%ghost %attr(0644,-,-) %{_mandir}/man1/delv.1%{manext}
%ghost %attr(0644,-,-) %{_mandir}/man1/dig.1%{manext}