openssh unix dev - May 2000 - Patch for 2.0.0beta2-1.src.rpm on Mandrake

Damien,

  I had to apply the following simple patch for the
openssh-2.0.0beta2-1.src.rpm package to build on my Mandrake Linux system
(see below for patch). Basically, Mandrake auto compresses man pages in
the build sequence (appending a .bz2 extension), so I had to change the
%files sections to find the compressed man pages.

  By using wildcards, I expect that this patch will NOT break the build
under Redhat systems, so hopefully a separate Mandrake spec file is not
needed.  Beta 2.0.0 seems to work fine, BTW.

Cheers,

-- 
Chad Netzer
cnetzer at stanford.edu

--------------------------- [ Cut Here ] ----------------------------
--- openssh.spec.rh.orig        Mon May  1 16:59:01 2000
+++ openssh.spec.rh     Tue May  9 12:35:57 2000
@@ -207,8 +207,8 @@
 %doc CREDITS UPGRADING
 %attr(0755,root,root) /usr/bin/ssh-keygen
 %attr(0755,root,root) /usr/bin/scp
-%attr(0644,root,root) /usr/man/man1/ssh-keygen.1
-%attr(0644,root,root) /usr/man/man1/scp.1
+%attr(0644,root,root) /usr/man/man1/ssh-keygen.1*
+%attr(0644,root,root) /usr/man/man1/scp.1*
 %attr(0755,root,root) %dir /etc/ssh
 %attr(0755,root,root) %dir /usr/libexec/ssh

@@ -217,17 +217,17 @@
 %attr(4755,root,root) /usr/bin/ssh
 %attr(0755,root,root) /usr/bin/ssh-agent
 %attr(0755,root,root) /usr/bin/ssh-add
-%attr(0644,root,root) /usr/man/man1/ssh.1
-%attr(0644,root,root) /usr/man/man1/ssh-agent.1
-%attr(0644,root,root) /usr/man/man1/ssh-add.1
+%attr(0644,root,root) /usr/man/man1/ssh.1*
+%attr(0644,root,root) /usr/man/man1/ssh-agent.1*
+%attr(0644,root,root) /usr/man/man1/ssh-add.1*
 %attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config
 %attr(-,root,root) /usr/bin/slogin
-%attr(-,root,root) /usr/man/man1/slogin.1
+%attr(-,root,root) /usr/man/man1/slogin.1*

 %files server
 %defattr(-,root,root)
 %attr(0755,root,root) /usr/sbin/sshd
-%attr(0644,root,root) /usr/man/man8/sshd.8
+%attr(0644,root,root) /usr/man/man8/sshd.8*
 %attr(0600,root,root) %config(noreplace) /etc/ssh/sshd_config
 %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
 %attr(0755,root,root) %config /etc/rc.d/init.d/sshd

>   By using wildcards, I expect that this patch will NOT break the build
> under Redhat systems, so hopefully a separate Mandrake spec file is not
> needed.  Beta 2.0.0 seems to work fine, BTW.
This is AFAIK preferred behaviour and things won't get broken.  Newer RPM
versions compress the man pages automatically, and if you try to rebuild
the package using one, it'll fail on Redhat too unless something like
ssh.1* is used.

ssh.1* is the best solution anyway, because it supports .gz, .bz2 and
non-compressed manpages.  This will get very tricky however, if man pages
have to be symlinked though.

-- 
Pekka Savola                    "Tell me of difficulties surmounted, 
Pekka.Savola at netcore.fi          not those you stumble over and fall"