Use make macros
Reduce number of variables, use prepared %make_build and %make_install where possible. Manual merge of MR #7.
This commit is contained in:
parent
5c10c94304
commit
177a98f40b
20
bind.spec
20
bind.spec
|
@ -67,7 +67,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.11.26
|
Version: 9.11.26
|
||||||
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/
|
||||||
#
|
#
|
||||||
|
@ -746,7 +746,7 @@ export LIBDIR_SUFFIX
|
||||||
%endif
|
%endif
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
### FIXME hack!!!
|
### FIXME hack!!!
|
||||||
### xsltproc doesn't find properly configured files
|
### xsltproc doesn't find properly configured files
|
||||||
|
@ -858,7 +858,7 @@ do
|
||||||
-i isc-export-config.sh
|
-i isc-export-config.sh
|
||||||
done;
|
done;
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# export library unit tests
|
# export library unit tests
|
||||||
|
@ -981,12 +981,12 @@ touch ${RPM_BUILD_ROOT}/%{chroot_sdb_prefix}%{_sysconfdir}/named.conf
|
||||||
#end sdb-chroot
|
#end sdb-chroot
|
||||||
|
|
||||||
pushd build
|
pushd build
|
||||||
make DESTDIR=${RPM_BUILD_ROOT} install
|
%make_install
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%if %{with EXPORT_LIBS}
|
%if %{with EXPORT_LIBS}
|
||||||
pushd export-libs
|
pushd export-libs
|
||||||
make DESTDIR=${RPM_BUILD_ROOT} install
|
%make_install
|
||||||
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d
|
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d
|
||||||
echo "%{_libdir}/%{_export_dir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
|
echo "%{_libdir}/%{_export_dir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
|
||||||
cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}%{_export_dir}
|
cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}%{_export_dir}
|
||||||
|
@ -1038,16 +1038,16 @@ install -m 644 %{SOURCE12} contrib/sdb/pgsql/
|
||||||
pushd contrib/dlz
|
pushd contrib/dlz
|
||||||
pushd modules
|
pushd 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}/bind install
|
%make_install -C $DIR libdir=%{_libdir}/bind
|
||||||
done
|
done
|
||||||
mv mysqldyn/testing/README mysqldyn/testing/README.testing
|
mv mysqldyn/testing/README mysqldyn/testing/README.testing
|
||||||
%if %{with BDB}
|
%if %{with BDB}
|
||||||
make -C bdbhpt DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/bind install
|
%make_install -C bdbhpt libdir=%{_libdir}/bind
|
||||||
%endif
|
%endif
|
||||||
popd
|
popd
|
||||||
%if %{with BDB}
|
%if %{with BDB}
|
||||||
pushd bin/dlzbdb
|
pushd bin/dlzbdb
|
||||||
make DESTDIR=${RPM_BUILD_ROOT} install
|
%make_install
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
popd
|
popd
|
||||||
|
@ -1628,6 +1628,10 @@ fi;
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 06 2021 Petr Menšík <pemensik@redhat.com> - 32:9.11.26-2
|
||||||
|
- Use make macros
|
||||||
|
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||||
|
|
||||||
* Mon Jan 04 2021 Petr Menšík <pemensik@redhat.com> - 32:9.11.26-1
|
* Mon Jan 04 2021 Petr Menšík <pemensik@redhat.com> - 32:9.11.26-1
|
||||||
- Update to 9.11.26
|
- Update to 9.11.26
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue