From 7a5c5a3a53b4e18185c4d299c46400ef3dbd2af5 Mon Sep 17 00:00:00 2001
From: panchenbo <panchenbo@uniontech.com>
Date: Wed, 21 Jul 2021 11:27:54 +0800
Subject: [PATCH] fix pam_ssh_agent_auth.8.gz conflicts

---
 openssh.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openssh.spec b/openssh.spec
index 3d8c48c..94a57c1 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -6,7 +6,7 @@
 %{?no_gtk2:%global gtk2 0}
 
 %global sshd_uid    74
-%global openssh_release 10
+%global openssh_release 11
 
 Name:           openssh
 Version:        8.2p1
@@ -449,7 +449,6 @@ getent passwd sshd >/dev/null || \
 %files -n pam_ssh_agent_auth
 %license pam_ssh_agent_auth-0.10.3/OPENSSH_LICENSE
 %attr(0755,root,root) %{_libdir}/security/pam_ssh_agent_auth.so
-%attr(0644,root,root) %{_mandir}/man8/pam_ssh_agent_auth.8*
 
 %files help
 %doc ChangeLog OVERVIEW PROTOCOL* README README.privsep README.tun README.dns TODO openssh-lpk-openldap.schema
@@ -464,6 +463,9 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 
 %changelog
+* Wed Jul 21 2021 panchenbo<panchenbo@uniontech.com> - 8.2P1-11
+- fix pam_ssh_agent_auth.8.gz conflicts
+
 * Fri May 21 2021 renmingshuai<renmingshuai@huawei.com> - 8.2P1-10
 - Type:cves
 - ID:NA
-- 
Gitee