- (djm) [ contrib/caldera/openssh.spec contrib/redhat/openssh.spec]

   [contrib/suse/openssh.spec] Include moduli.5 in RPM spec files.

diff --git a/ChangeLog b/ChangeLog
index 45fcfafd73f9f65635022fea5b5c5206aed8b3c9..2897b24b49ec43340fd00fb96606bc2307d6b66e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20080626
  - (djm) [Makefile.in moduli.5] Include moduli(5) manpage from OpenBSD.
    (bz#1372)
+ - (djm) [ contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Include moduli.5 in RPM spec files.
 
 20080616
  - (dtucker) OpenBSD CVS Sync

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 5b2fcdf1a35323b07a008bfdf3cd3bf49687ee27..6bf2df1d3152d8d40064c1c828311bf76f70aa68 100644 (file)
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -342,6 +342,7 @@ fi
 %config %{SVIcdir}/sshd
 %{_libexecdir}/sftp-server
 %{_sbindir}/sshd
+%{_mandir}/man5/moduli.5.gz
 %{_mandir}/man5/sshd_config.5.gz
 %{_mandir}/man8/sftp-server.8.gz
 %{_mandir}/man8/sshd.8.gz

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 28f3fdadaae18c103e40461c226957c576a8f8c5..8b5ac47b4892ba52fea8ac8e1909269839a0a2db 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -376,6 +376,7 @@ fi
 %attr(0755,root,root) %{_sbindir}/sshd
 %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
 %attr(0644,root,root) %{_mandir}/man8/sshd.8*
+%attr(0644,root,root) %{_mandir}/man5/moduli.5*
 %attr(0644,root,root) %{_mandir}/man5/sshd_config.5*
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh

diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 4e8c1e3326e37eea1d3bf0593f26ec604f6780a9..535381491ec87c683b420828a4bdfa271fa02555 100644 (file)
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -228,6 +228,7 @@ fi
 %attr(0644,root,root) %doc %{_mandir}/man1/ssh-agent.1*
 %attr(0644,root,root) %doc %{_mandir}/man1/ssh-keygen.1*
 %attr(0644,root,root) %doc %{_mandir}/man1/ssh-keyscan.1*
+%attr(0644,root,root) %doc %{_mandir}/man5/moduli.5*
 %attr(0644,root,root) %doc %{_mandir}/man5/ssh_config.5*
 %attr(0644,root,root) %doc %{_mandir}/man5/sshd_config.5*
 %attr(0644,root,root) %doc %{_mandir}/man8/sftp-server.8*