Remove DEVEL conditional define

I find no reason to turn off devel package creation. It can be ignored
if required, but is mandatory due to Fedora packaging guidelines.
Simplify it a bit.
This commit is contained in:
Petr Menšík 2020-09-15 17:55:01 +02:00
parent 1799c36d23
commit 8a73c57ad4

View File

@ -14,7 +14,6 @@
# it is not possible to build the package without PKCS11 sub-package
# due to extensive changes to Makefiles
%bcond_without PKCS11
%bcond_without DEVEL
%bcond_without JSON
%bcond_without DLZ
# New MaxMind GeoLite support
@ -308,7 +307,6 @@ revocation and verification of keys and DNSSEC signatures in zone files.
You should install bind-dnssec-utils if you need to sign a DNS zone
or maintain keys for it.
%if %{with DEVEL}
%package devel
Summary: Header files and libraries needed for BIND DNS development
Obsoletes:bind-libbind-devel < 31:9.3.3-4.fc7
@ -331,7 +329,6 @@ Requires: fstrm-devel%{?_isa} protobuf-c-devel%{?_isa}
%endif
%if %{with GEOIP2}
Requires: libmaxminddb-devel%{?_isa}
%endif
%description devel
The bind-devel package contains full version of the header files and libraries
@ -736,12 +733,6 @@ popd
# Remove libtool .la files:
find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';';
# Remove -devel files out of buildroot if not needed
%if %{without DEVEL}
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/bind9/*.so
rm -rf ${RPM_BUILD_ROOT}/%{_includedir}/bind9
%endif
# PKCS11 versions manpages
%if %{with PKCS11}
pushd ${RPM_BUILD_ROOT}%{_mandir}/man8
@ -1057,7 +1048,6 @@ fi;
%exclude %{_mandir}/man8/dnssec*-pkcs11.8*
%endif
%if %{with DEVEL}
%files devel
%{_libdir}/libbind9.so
%{_libdir}/libisccc.so
@ -1078,7 +1068,6 @@ fi;
%dir %{_includedir}/bind9/pk11
%{_includedir}/bind9/pk11/site.h
%{_includedir}/bind9/isccfg
%endif
%files chroot
%config(noreplace) %{_sysconfdir}/named-chroot.files