From bb75480a15180caea688bcc75095d96320e6399a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 27 Feb 2022 16:47:16 +0100 Subject: [PATCH] Add Conflicts for pam version before the split I had an upgrade failure where pam itself was blocked: Problem: cannot install both libnsl2-2.0.0-3.fc36.x86_64 and libnsl2-1.3.0-4.fc35.x86_64 - package pam-1.5.2-11.fc36.x86_64 requires libnsl.so.3()(64bit), but none of the providers can be installed - package pam-1.5.2-11.fc36.x86_64 requires libnsl.so.3(LIBNSL_2.0)(64bit), but none of the providers can be installed - package python26-2.6.9-21.fc31.x86_64 requires libnsl.so.2()(64bit), but none of the providers can be installed - package python26-2.6.9-21.fc31.x86_64 requires libnsl.so.2(LIBNSL_1.0)(64bit), but none of the providers can be installed - cannot install the best update candidate for package pam-1.5.2-7.fc35.x86_64 - problem with installed package python26-2.6.9-21.fc31.x86_64 So dnf would try to just install pam-libs, and that failed in the transaction test after downloading all the packages. Let's try to fail early in such a case. With the Conflicts: Problem 1: cannot install both libnsl2-2.0.0-3.fc36.x86_64 and libnsl2-1.3.0-4.fc35.x86_64 - package pam-1.5.2-12.fc36.x86_64 requires libnsl.so.3()(64bit), but none of the providers can be installed - package pam-1.5.2-12.fc36.x86_64 requires libnsl.so.3(LIBNSL_2.0)(64bit), but none of the providers can be installed - package python26-2.6.9-21.fc31.x86_64 requires libnsl.so.2()(64bit), but none of the providers can be installed - package python26-2.6.9-21.fc31.x86_64 requires libnsl.so.2(LIBNSL_1.0)(64bit), but none of the providers can be installed - cannot install the best update candidate for package pam-1.5.2-7.fc35.x86_64 - problem with installed package python26-2.6.9-21.fc31.x86_64 Problem 2: problem with installed package pam-devel-1.5.2-7.fc35.i686 - pam-devel-1.5.2-7.fc35.i686 has inferior architecture - pam-devel-1.5.2-11.fc36.i686 has inferior architecture - cannot install both pam-devel-1.5.2-12.fc36.x86_64 and pam-devel-1.5.2-7.fc35.x86_64 - cannot install both pam-devel-1.5.2-12.fc36.x86_64 and pam-devel-1.5.2-11.fc36.x86_64 - cannot install the best update candidate for package pam-devel-1.5.2-7.fc35.x86_64 =========================================================================================== Package Architecture Version Repository Size =========================================================================================== Skipping packages with conflicts: (add '--best --allowerasing' to command line to force their upgrade): libnsl2 x86_64 2.0.0-3.fc36 fedora 30 k pam-devel x86_64 1.5.2-11.fc36 fedora 97 k pam-devel x86_64 1.5.2-12.fc36 @commandline 97 k Skipping packages with broken dependencies: pam x86_64 1.5.2-12.fc36 @commandline 519 k --- pam.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pam.spec b/pam.spec index 1c9a398..4f3e4e4 100644 --- a/pam.spec +++ b/pam.spec @@ -4,7 +4,7 @@ Summary: An extensible library which provides authentication for applications Name: pam Version: 1.5.2 -Release: 11%{?dist} +Release: 12%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. # pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+. @@ -95,6 +95,9 @@ documentation in txt and html format. %package libs Summary: Shared libraries of the PAM package +# Make sure that if we don't try to upgrade -libs but not the +# main pam package and get file conflicts: +Conflicts: pam < 1.5.2-11 %description libs PAM (Pluggable Authentication Modules) is a system security tool that @@ -356,6 +359,9 @@ done %{_pam_libdir}/libpam_misc.so.%{so_ver}* %changelog +* Sun Feb 27 2022 Zbigniew Jędrzejewski-Szmek - 1.5.2-12 +- Add Conflicts for pam version before the split + * Thu Feb 17 2022 Björn Esser - 1.5.2-11 - Split shared libraries into pam-libs package (#2055572)