From efa98a68ef37694d97454a25d08658d987729778 Mon Sep 17 00:00:00 2001 From: jiangh Date: Wed, 26 May 2021 20:59:35 +0800 Subject: [PATCH] remove unnecessary dependencies --- bind.spec | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/bind.spec b/bind.spec index 59f3df0..8908d1f 100644 --- a/bind.spec +++ b/bind.spec @@ -63,10 +63,10 @@ Source35: named.root.key BuildRequires: openssl-devel libtool autoconf pkgconfig libcap-devel python3-devel python3-ply docbook-style-xsl BuildRequires: libidn2-devel libxml2-devel make systemd selinux-policy findutils sed libxslt gdb -BuildRequires: bind-libs bind-libs-lite bind-export-libs bind-pkcs11 +BuildRequires: chrpath %if %{with SDB} -BuildRequires: openldap-devel libpq-devel sqlite-devel mariadb-connector-c-devel libdb-devel +BuildRequires: openldap-devel libpq-devel sqlite-devel mariadb-connector-c-devel %endif %if %{with UNITTEST} @@ -473,7 +473,7 @@ export LIBDIR_SUFFIXi= %endif %if %{with SDB} --with-dlopen=yes --with-dlz-ldap=yes --with-dlz-postgres=yes \ - --with-dlz-mysql=yes --with-dlz-filesystem=yes --with-dlz-bdb=yes \ + --with-dlz-mysql=yes --with-dlz-filesystem=yes \ %endif %if %{with GSSTSIG} --with-gssapi=yes --disable-isc-spnego \ @@ -508,7 +508,7 @@ export LIBDIR_SUFFIXi= popd %endif -make -j32 +%make_build cp -rv doc/* ../doc/ pushd bin/dig @@ -559,7 +559,7 @@ for lib in isc dns isccfg irs; do -i isc-export-config.sh done -make -j32 +%make_build popd %unit_prepare_build export-libs @@ -753,10 +753,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/named.conf install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named -cp -a %{_libdir}/%{_export_dir}/lib{dns,irs,isc,isccfg}-export.so.* %{buildroot}%{_libdir}/%{_export_dir} -cp -a %{_libdir}/lib{dns,isc}-pkcs11.so.* %{buildroot}%{_libdir} -cp -a %{_libdir}/lib{bind9,isccc,lwres,irs,isccfg}.so.160* %{buildroot}%{_libdir} -cp -a %{_libdir}/lib{dns.so.1102*,isc.so.169*} %{buildroot}%{_libdir} +chrpath -d %{buildroot}/%{_libdir}/bind9-export/*.so* %pre if [ "$1" -eq 1 ]; then @@ -947,20 +944,11 @@ rm -rf ${RPM_BUILD_ROOT} %dir /run/named %files libs -%{_libdir}/libbind9.so.160* -%{_libdir}/libisccc.so.160* -%{_libdir}/liblwres.so.160* - %{_libdir}/libbind9.so.161* %{_libdir}/libisccc.so.161* %{_libdir}/liblwres.so.161* %files libs-lite -%{_libdir}/libdns.so.1102* -%{_libdir}/libirs.so.160* -%{_libdir}/libisc.so.169* -%{_libdir}/libisccfg.so.160* - %{_libdir}/libdns.so.1110* %{_libdir}/libirs.so.161* %{_libdir}/libisc.so.1105* @@ -1147,8 +1135,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_unitdir}/named-pkcs11.service %{_libexecdir}/setup-named-softhsm.sh %{_mandir}/man8/*pkcs11*.8* -%{_libdir}/libdns-pkcs11.so.1102* -%{_libdir}/libisc-pkcs11.so.169* %files pkcs11-devel %{_libdir}/lib*-pkcs11.so @@ -1167,11 +1153,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/%{_export_dir}/libisc-export.so.1105* %{_libdir}/%{_export_dir}/libisccfg-export.so.163* -%{_libdir}/%{_export_dir}/libdns-export.so.1102* -%{_libdir}/%{_export_dir}/libirs-export.so.160* -%{_libdir}/%{_export_dir}/libisc-export.so.169* -%{_libdir}/%{_export_dir}/libisccfg-export.so.160* - %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf %files export-devel @@ -1191,6 +1172,12 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed May 26 2021 jiangheng - 9.11.21-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove unnecessary dependencies + * Wed May 26 2021 jiangheng - 9.11.21-6 - Type:CVE - ID:NA -- Gitee