rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Use make macros

Browse Source 
Reduce number of variables, use prepared %make_build and %make_install
where possible.

Manual merge of MR #7.
This commit is contained in:
Petr Menšík 2021-01-06 14:41:24 +01:00
parent ddf24a90e3
commit bea44d51ee
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bind.spec
View File

@ -66,7 +66,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.16.10 Version: 9.16.10
Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
# #
@ -628,7 +628,7 @@ then
set -e set -e
pushd build/bin/tests pushd build/bin/tests
chown -R ${USER} . # Can be unknown user chown -R ${USER} . # Can be unknown user
make test %{?_smp_mflags} 2>&1 | tee test.log %make_build test 2>&1 | tee test.log
e=$? e=$?
popd popd
[ "$CONFIGURED" = build ] && sh bin/tests/system/ifconfig.sh down [ "$CONFIGURED" = build ] && sh bin/tests/system/ifconfig.sh down
@ -706,7 +706,7 @@ install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
pushd build pushd build
pushd contrib/dlz/modules pushd contrib/dlz/modules
for DIR in filesystem ldap mysql mysqldyn sqlite3; do for DIR in filesystem ldap mysql mysqldyn sqlite3; do
make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/named install %make_install -C $DIR libdir=%{_libdir}/bind
done done
pushd ${RPM_BUILD_ROOT}/%{_libdir}/bind pushd ${RPM_BUILD_ROOT}/%{_libdir}/bind
cp -s ../named/dlz_*.so . cp -s ../named/dlz_*.so .
@ -1162,6 +1162,10 @@ fi;
%endif %endif
%changelog %changelog
* Wed Jan 06 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.10-2
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Tue Jan 05 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.10-1 * Tue Jan 05 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.10-1
- Update to 9.16.10 - Update to 9.16.10