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: RHEL-14898
This commit is contained in:
Petr Menšík 2024-06-19 20:41:31 +02:00
parent 298856fa52
commit 21bc9027a3

View File

@ -192,22 +192,16 @@ tools for verifying that the DNS server is operating properly.
%package libs %package libs
Summary: Libraries used by the BIND DNS packages 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} Provides: %{name}-libs-lite = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-libs-lite < 32:9.16.13 Obsoletes: %{name}-libs-lite < 32:9.16.13
Obsoletes: %{name}-pkcs11-libs < 32:9.18.4-2 Obsoletes: %{name}-pkcs11-libs < 32:9.18.4-2
Obsoletes: %{name}-license < 32:9.18.27-2
%description libs %description libs
Contains heavyweight version of BIND suite libraries used by both named DNS Contains heavyweight version of BIND suite libraries used by both named DNS
server and utilities in %{name}-utils package. 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 %package utils
Summary: Utilities for querying DNS name servers Summary: Utilities for querying DNS name servers
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
@ -324,7 +318,6 @@ Dynamic Loadable Zones sqlite3 module for BIND server.
%if %{with DOC} %if %{with DOC}
%package doc %package doc
Summary: BIND 9 Administrator Reference Manual Summary: BIND 9 Administrator Reference Manual
Requires: %{name}-license = %{epoch}:%{version}-%{release}
Requires: python3-sphinx_rtd_theme Requires: python3-sphinx_rtd_theme
BuildArch: noarch BuildArch: noarch
@ -837,8 +830,6 @@ fi;
%{_libdir}/libirs-%{version}*.so %{_libdir}/libirs-%{version}*.so
%{_libdir}/libisc-%{version}*.so %{_libdir}/libisc-%{version}*.so
%{_libdir}/libisccfg-%{version}*.so %{_libdir}/libisccfg-%{version}*.so
%files license
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYRIGHT %license COPYRIGHT
@ -963,6 +954,7 @@ fi;
%dir %{_pkgdocdir} %dir %{_pkgdocdir}
%doc %{_pkgdocdir}/html %doc %{_pkgdocdir}/html
%doc %{_pkgdocdir}/Bv9ARM.html %doc %{_pkgdocdir}/Bv9ARM.html
%license COPYRIGHT
%endif %endif
%if %{with DOCPDF} %if %{with DOCPDF}
%doc %{_pkgdocdir}/Bv9ARM.pdf %doc %{_pkgdocdir}/Bv9ARM.pdf
@ -972,6 +964,7 @@ fi;
* Wed Jun 19 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.27-2 * Wed Jun 19 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.27-2
- Disable building of DLZ packages - Disable building of DLZ packages
- Conflict explicitly with more bind subpackages - Conflict explicitly with more bind subpackages
- Merge license subpackage into libs
* Thu May 16 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.27-1 * Thu May 16 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.27-1
- Update to 9.18.27 - Update to 9.18.27