Remove separate license subpackage

Move license to libs subpackage, it is required for everything except
documentation. Include license file in docs and bind-libs, avoid extra
package just for single file.

Resolves: rhbz#2308102

.gitignore

@@ -220,3 +220,9 @@ bind-9.7.2b1.tar.gz
 /bind-9.18.20.tar.xz.asc
 /bind-9.18.21.tar.xz
 /bind-9.18.21.tar.xz.asc
+/bind-9.18.24.tar.xz
+/bind-9.18.24.tar.xz.asc
+/bind-9.18.26.tar.xz
+/bind-9.18.26.tar.xz.asc
+/bind-9.18.28.tar.xz
+/bind-9.18.28.tar.xz.asc

bind.spec

@@ -8,8 +8,10 @@
 %bcond_with    SYSTEMTEST
 %bcond_without GSSTSIG
 %bcond_without JSON
+%if ! 0%{?rhel}
 # FIXME: Not ready. Should it be worked on?
 %bcond_without DLZ
+%endif
 # New MaxMind GeoLite support
 %bcond_without GEOIP2
 # Disabled temporarily until kyua is fixed on rawhide, bug #1926779
@@ -52,10 +54,10 @@
 
 # Upstream package name
 %global upname bind
+# Epoch is intentionally missing from Provides to be lower than bind package
 %define upname_compat() \
 %if "%{name}" != "%{upname}" \
-Provides: %1 = %{epoch}:%{version}-%{release} \
-Obsoletes: %1 < 32:9.17.0 \
+Provides: %1 = %{version}-%{release} \
 Conflicts: %1 \
 %endif
 
@@ -76,8 +78,8 @@ License:  MPL-2.0 AND ISC AND MIT AND BSD-3-Clause AND BSD-2-Clause
 # ./lib/isc/string.c BSD-3-clause and/or MPL-2.0
 # ./lib/isc/tm.c BSD-2-clause and/or MPL-2.0
 # ./lib/isccfg/parser.c BSD-2-clause and/or MPL-2.0
-Version:  9.18.21
-Release:  2%{?dist}
+Version:  9.18.28
+Release:  3%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -123,7 +125,7 @@ Requires(post): glibc-common
 Requires(post): grep
 Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Recommends:     %{name}-utils %{name}-dnssec-utils
-%upname_compat %{upname}
+%upname_compat  %{upname}
 Obsoletes:      %{name}-pkcs11 < 32:9.18.4-2
 
 BuildRequires:  gcc, make
@@ -191,22 +193,16 @@ tools for verifying that the DNS server is operating properly.
 
 %package libs
 Summary: Libraries used by the BIND DNS packages
-Requires: %{name}-license = %{epoch}:%{version}-%{release}
+Provides: %{name}-license = %{epoch}:%{version}-%{release}
 Provides: %{name}-libs-lite = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-libs-lite < 32:9.16.13
 Obsoletes: %{name}-pkcs11-libs < 32:9.18.4-2
+Obsoletes: %{name}-license < 32:9.18.28-3
 
 %description libs
 Contains heavyweight version of BIND suite libraries used by both named DNS
 server and utilities in %{name}-utils package.
 
-%package license
-Summary:  License of the BIND DNS suite
-BuildArch:noarch
-
-%description license
-Contains license of the BIND DNS suite.
-
 %package utils
 Summary: Utilities for querying DNS name servers
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
@@ -248,6 +244,7 @@ Obsoletes: %{name}-lite-devel < 32:9.16.6-3
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: openssl-devel%{?_isa} libxml2-devel%{?_isa}
 Requires: libcap-devel%{?_isa}
+%upname_compat %{upname}-devel
 %if %{with GSSTSIG}
 Requires: krb5-devel%{?_isa}
 %endif
@@ -275,6 +272,10 @@ Prefix:         %{chroot_prefix}
 # grep is required due to setup-named-chroot.sh script
 Requires:       grep
 Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+%upname_compat %{upname}-chroot
+%if "%{name}" != "%{upname}"
+Conflicts:      %{upname}-sdb-chroot
+%endif
 
 %description chroot
 This package contains a tree of files which can be used as a
@@ -318,7 +319,6 @@ Dynamic Loadable Zones sqlite3 module for BIND server.
 %if %{with DOC}
 %package doc
 Summary:   BIND 9 Administrator Reference Manual
-Requires:  %{name}-license = %{epoch}:%{version}-%{release}
 Requires:  python3-sphinx_rtd_theme
 BuildArch: noarch
 
@@ -625,7 +625,7 @@ do
   BINDTHEMEDIR="${RPM_BUILD_ROOT}%{_pkgdocdir}/html/_static/$BASE"
   if [ -d "$BINDTHEMEDIR" ]; then
     rm -rf "$BINDTHEMEDIR"
-    ln -s "$DIR" "$BINDTHEMEDIR"
+    ln -sr "${RPM_BUILD_ROOT}${DIR}" "$BINDTHEMEDIR"
   fi
 done
 %endif
@@ -832,8 +832,6 @@ fi;
 %{_libdir}/libirs-%{version}*.so
 %{_libdir}/libisc-%{version}*.so
 %{_libdir}/libisccfg-%{version}*.so
-
-%files license
 %{!?_licensedir:%global license %%doc}
 %license COPYRIGHT
 
@@ -956,12 +954,33 @@ fi;
 %dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/html
 %doc %{_pkgdocdir}/Bv9ARM.html
+%license COPYRIGHT
 %endif
 %if %{with DOCPDF}
 %doc %{_pkgdocdir}/Bv9ARM.pdf
 %endif
 
 %changelog
+* Thu Nov 14 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.28-3
+- Remove separate license subpackage (rhbz#2308102)
+
+* Wed Jul 31 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.28-2
+- Conflict explicitly with more bind subpackages
+- Make relative documentation links
+
+* Fri Jul 26 2024 Jonathan Wright <jonathan@almalinux.org> - 32:9.18.28-1
+- update to 9.18.28 rhbz#2299467
+- Fixes CVE-2024-4076
+- Fixes CVE-2024-1975
+- Fixes CVE-2024-1737
+- Fixes CVE-2024-0760
+
+* Mon Apr 22 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.26-1
+- Update to 9.18.26 (rhbz#2270476)
+
+* Thu Feb 15 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.24-1
+- Update to 9.18.24 (#2264032)
+
 * Tue Jan 16 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.21-2
 - Update changed b.root-servers.net address in hints (#2253460)
 

sources

@@ -1,2 +1,2 @@
-SHA512 (bind-9.18.21.tar.xz) = 3cbc1775b6ca3d5eda0c277ab1246b5baa535dac53df3e60690aa7a2529bcb0fb644f7749b21b757870e5b3bc5f53ae9f0c0db182664de1b23f7e62c3fa8757d
-SHA512 (bind-9.18.21.tar.xz.asc) = 1afa22dddb5d6c42e2dea2369cc048d548ad86e3d215c692320716488419c012ac849f1699d61451353574ec4621fc93f7111658e9de7fa286336d97e33d5de6
+SHA512 (bind-9.18.28.tar.xz) = 19ba625f155c60dd821e3afe52adf3897b3e81289320282b3f43d604af1e7d4e67fafb98a9849782684935008bcd148f190e05234d501aa056daa6724e0119bb
+SHA512 (bind-9.18.28.tar.xz.asc) = e6efe2a9995cabd70c1d2e8e4cb97a9a146e3289d75cfdc81ff8052329db3dd920b9f8f6ad0f1552a0e4e776b01fb077edd5f3d4ea3461952f71dda64574d640