From 1799c36d2300037d91634c11e85d0934ffaa3868 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Sep 15 2020 15:51:50 +0000
Subject: Merge bind-lite-devel into bind-devel


Those packages were very similar in BIND 9.11. Since there is no
isc-config.sh, no significant or required reason to have them separated
exist. Keep separated libraries, but only one devel package.

---

diff --git a/bind.spec b/bind.spec
index 768ef33..4a55578 100644
--- a/bind.spec
+++ b/bind.spec
@@ -67,7 +67,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.16.6
-Release:  2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -244,7 +244,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
@@ -314,15 +314,7 @@ Summary:  Header files and libraries needed for BIND DNS development
 Obsoletes:bind-libbind-devel < 31:9.3.3-4.fc7
 Provides: bind-libbind-devel = 31:9.3.3-4.fc7
 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
-%endif
-
-%package lite-devel
-Summary:  Lite version of header files and libraries needed for BIND DNS development
+Provides: bind-lite-devel%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: openssl-devel%{?_isa} libxml2-devel%{?_isa}
 %if %{with GSSTSIG}
@@ -341,9 +333,10 @@ Requires:  fstrm-devel%{?_isa} protobuf-c-devel%{?_isa}
 Requires:  libmaxminddb-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
+%endif
 
 %package chroot
 Summary:        A chroot runtime environment for the ISC BIND DNS server, named(8)
@@ -1069,18 +1062,15 @@ fi;
 %{_libdir}/libbind9.so
 %{_libdir}/libisccc.so
 %{_libdir}/libns.so
-%{_includedir}/bind9/config.h
-%{_includedir}/bind9/bind9
-%{_includedir}/bind9/isccc
-%{_includedir}/bind9/ns
-%endif
-
-%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/ns
 %{_includedir}/bind9/dns
 %{_includedir}/bind9/dst
 %{_includedir}/bind9/irs
@@ -1088,6 +1078,7 @@ fi;
 %dir %{_includedir}/bind9/pk11
 %{_includedir}/bind9/pk11/site.h
 %{_includedir}/bind9/isccfg
+%endif
 
 %files chroot
 %config(noreplace) %{_sysconfdir}/named-chroot.files
@@ -1193,6 +1184,9 @@ fi;
 %endif
 
 %changelog
+* Tue Sep 15 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.6-3
+- Merge bind-lite-devel into devel package
+
 * Mon Sep 14 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.6-2
 - Share static data in doc package