From fdcede6a5dfa79efbdeca27cf2cedd5d2f9433e6 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Mon, 21 Mar 2022 12:43:05 +0800 Subject: [PATCH] optimise Conflicts version Signed-off-by: Chunmei Xu --- authselect.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/authselect.spec b/authselect.spec index d7d4cfa..33f9156 100644 --- a/authselect.spec +++ b/authselect.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 # Do not terminate build if language files are empty. %define _empty_manifest_terminate_build 0 @@ -64,11 +64,11 @@ Requires: sed Suggests: systemd %if %{enforce_authselect} # authselect now owns nsswitch.conf (glibc) and pam files -Conflicts: pam < 1.5.2-8 -Conflicts: glibc < 2.34.9000-28 +Conflicts: pam < 1.5.2 +Conflicts: glibc < 2.35 # systemd, nss-mdns no longer contains nsswitch.conf scriptlets -Conflicts: systemd < 250~rc1-3 -Conflicts: nss-mdns < 0.15.1-3 +Conflicts: systemd < 250 +Conflicts: nss-mdns < 0.15.1 %endif %description libs @@ -324,6 +324,9 @@ fi exit 0 %changelog +* Mon Mar 21 2022 Chunmei Xu - 1.3.0-3 +- optimise Conflicts version + * Wed Mar 16 2022 Mingyue Zhao - 1.3.0-2 - Set with_user_nsswitch=0 enforce_authselect=1 -- Gitee