From 7df3699d639e03ae73f25329d95aa8363821af6b Mon Sep 17 00:00:00 2001
From: mgb01105731 <mgb01105731@alibaba-inc.com>
Date: Tue, 18 Oct 2022 10:58:38 +0800
Subject: [PATCH]  optimise spec file & add doc package

---
 openssh.spec | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/openssh.spec b/openssh.spec
index a670f13..74b32dc 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,3 +1,4 @@
+%define anolis_release 3
 # Do we want SELinux & Audit
 %if 0%{?!noselinux:1}
 %global WITH_SELINUX 1
@@ -307,6 +308,14 @@ remote ssh-agent instance.
 
 The module is most useful for su and sudo service stacks.
 
+%package doc
+Summary:        Documentation files for %{name}
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description    doc
+The %{name}-doc package contains documentation files for %{name}.
+
 %prep
 gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
 %setup -q -a 4
@@ -539,6 +548,9 @@ pushd pam_ssh_agent_auth-pam_ssh_agent_auth-%{pam_ssh_agent_ver}
 %make_install
 popd
 %endif
+
+%generate_compatibility_deps
+
 %pre
 getent group ssh_keys >/dev/null || groupadd -r ssh_keys || :
 
@@ -574,16 +586,20 @@ test -f %{sysconfig_anaconda} && \
 %systemd_user_preun ssh-agent.service
 
 %files
+%dir %{abidir}
 %license LICENCE
-%doc CREDITS ChangeLog OVERVIEW PROTOCOL* README README.platform README.privsep README.tun README.dns TODO
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli
 %attr(0755,root,root) %{_bindir}/ssh-keygen
+%attr(0644,root,root) %{abidir}/ssh-keygen-option.list
 %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
 %attr(2555,root,ssh_keys) %{_libexecdir}/openssh/ssh-keysign
 %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*
 
+%files doc
+%doc CREDITS ChangeLog OVERVIEW PROTOCOL* README README.platform README.privsep README.tun README.dns TODO
+
 %files clients
 %attr(0755,root,root) %{_bindir}/ssh
 %attr(0644,root,root) %{_mandir}/man1/ssh.1*
@@ -608,10 +624,14 @@ test -f %{sysconfig_anaconda} && \
 %attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8*
 %attr(0644,root,root) %{_mandir}/man8/ssh-sk-helper.8*
 %attr(0644,root,root) %{_userunitdir}/ssh-agent.service
+%attr(0644,root,root) %{abidir}/scp-option.list
+%attr(0644,root,root) %{abidir}/sftp-option.list
+%attr(0644,root,root) %{abidir}/ssh*-option.list
 
 %files server
 %dir %attr(0711,root,root) %{_datadir}/empty.sshd
 %attr(0755,root,root) %{_sbindir}/sshd
+%attr(0644,root,root) %{abidir}/sshd-option.list
 %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
 %attr(0755,root,root) %{_libexecdir}/openssh/sshd-keygen
 %attr(0644,root,root) %{_mandir}/man5/sshd_config.5*
@@ -645,10 +665,14 @@ test -f %{sysconfig_anaconda} && \
 %files -n pam_ssh_agent_auth
 %license pam_ssh_agent_auth-pam_ssh_agent_auth-%{pam_ssh_agent_ver}/OPENSSH_LICENSE
 %attr(0755,root,root) %{_libdir}/security/pam_ssh_agent_auth.so
+%attr(0644,root,root) %{abidir}/pam_ssh_agent_auth.dump
 %attr(0644,root,root) %{_mandir}/man8/pam_ssh_agent_auth.8*
 %endif
 
 %changelog
+* Tue Oct 18 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 8.8p1-3
+- optimise spec file & add doc package
+
 * Mon Aug 29 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 8.8p1-2
 - Use gtk3 intead of gtk2
 - add openssh-server and openssh-clients as Requires for openssh-askpass to make sure update
-- 
Gitee