diff --git a/bind.spec b/bind.spec index 1e4edfa..52318db 100644 --- a/bind.spec +++ b/bind.spec @@ -290,7 +290,7 @@ functionality. %package pkcs11-devel Summary: Development files for Bind libraries compiled with native PKCS#11 Requires: bind-pkcs11-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: bind-lite-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: bind-devel%{?_isa} = %{epoch}:%{version}-%{release} %description pkcs11-devel This a set of development files for BIND libraries (dns, isc) compiled @@ -383,14 +383,8 @@ Bind-dnssec-doc contains manual pages for bind-dnssec-utils. %package devel Summary: Header files and libraries needed for BIND DNS development Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: bind-lite-devel%{?_isa} = %{epoch}:%{version}-%{release} - -%description devel -The bind-devel package contains full version of the header files and libraries -required for development with ISC BIND 9 - -%package lite-devel -Summary: Lite version of header files and libraries needed for BIND DNS development +Provides: bind-lite-devel = %{epoch}:%{version}-%{release} +Obsoletes: bind-lite-devel < 32:9.11.23-1 Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release} Requires: openssl-devel%{?_isa} libxml2-devel%{?_isa} # Not required by headers, but "isc-config.sh --libs isc" requires it @@ -408,9 +402,9 @@ Requires: json-c-devel%{?_isa} Requires: fstrm-devel%{?_isa} protobuf-c-devel%{?_isa} %endif -%description lite-devel -The bind-lite-devel package contains lite version of the header -files and libraries required for development with ISC BIND 9 +%description devel +The bind-devel package contains full version of the header files and libraries +required for development with ISC BIND 9 %package chroot Summary: A chroot runtime environment for the ISC BIND DNS server, named(8) @@ -1425,22 +1419,20 @@ fi; %{_libdir}/libbind9.so %{_libdir}/libisccc.so %{_libdir}/liblwres.so -%{_includedir}/bind9/config.h -%{_includedir}/bind9/bind9 -%{_includedir}/bind9/isccc %{_includedir}/bind9/lwres %{_mandir}/man1/isc-config.sh.1* %{_mandir}/man1/bind9-config.1* %{_mandir}/man3/lwres* %{_bindir}/isc-config.sh %{_bindir}/bind9-config - -%files lite-devel %{_libdir}/libdns.so %{_libdir}/libirs.so %{_libdir}/libisc.so %{_libdir}/libisccfg.so %dir %{_includedir}/bind9 +%{_includedir}/bind9/config.h +%{_includedir}/bind9/bind9 +%{_includedir}/bind9/isccc %{_includedir}/bind9/dns %{_includedir}/bind9/dst %{_includedir}/bind9/irs @@ -1629,6 +1621,7 @@ fi; %changelog * Thu Sep 17 2020 Petr Menšík - 32:9.11.23-1 - Update to 9.11.23 +- Merge bind-lite-devel into devel package * Tue Sep 01 2020 Petr Menšík - 32:9.11.22-2 - Require libcap from devel package