From a2c04215f003875c12fa2bd2caeba7c46dd0d04c Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Thu, 29 Jun 2023 08:12:27 +0200 Subject: [PATCH] Replace file dependency by package name By default, dnf5 does not download the filelists repository metadata required to resolve file dependencies outside of /usr/(s)bin or /etc. This causes the krb5-server file to become uninstallable. $ dnf5 install krb5-server Repositories loaded. Failed to resolve the transaction: Problem: conflicting requests - nothing provides /usr/share/dict/words needed by krb5-server-1.21-1.fc39.x86_64 This change aligns with the Fedora packaging guidelines, as stated here: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2216903 --- krb5.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/krb5.spec b/krb5.spec index a16e111..f67b1a5 100644 --- a/krb5.spec +++ b/krb5.spec @@ -10,7 +10,7 @@ # # baserelease is what we have standardized across Fedora and what # rpmdev-bumpspec knows how to handle. -%global baserelease 1 +%global baserelease 2 # This should be e.g. beta1 or %%nil %global pre_release %nil @@ -154,8 +154,8 @@ Requires(preun): systemd-units Requires(postun): systemd-units # we drop files in its directory, but we don't want to own that directory Requires: logrotate -# we specify /usr/share/dict/words as the default dict_file in kdc.conf -Requires: /usr/share/dict/words +# we specify /usr/share/dict/words (provided by words) as the default dict_file in kdc.conf +Requires: words # for run-time, and for parts of the test suite BuildRequires: libverto-module-base Requires: libverto-module-base @@ -252,7 +252,7 @@ Requires: python3-kdcproxy Requires: python3-pyrad Requires: resolv_wrapper Requires: /etc/crypto-policies/back-ends/krb5.config -Requires: /usr/share/dict/words +Requires: words #Requires: openldap-servers, openldap-clients %description tests @@ -708,6 +708,10 @@ exit 0 %{_datarootdir}/%{name}-tests/ %changelog +* Thu Jun 29 2023 Marek Blaha - 1.21-2 +- Replace file dependency with package name + Resolves: rhbz#2216903 + * Mon Jun 12 2023 Julien Rische - 1.21-1 - New upstream version (1.21) - Do not disable PKINIT if some of the well-known DH groups are unavailable