summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2003-03-20 20:50:41 -0800
committerTim Rice <tim@multitalents.net>2003-03-20 20:50:41 -0800
commit009b23f6ab8ee16480228bd12b50c76e037c9094 (patch)
treec45396737a312f41f78198e2f20f941326ad2fef
parentc8c548d24883eaff20ea1665022ee92bd0632e29 (diff)
[contrib/caldera/openssh.spec] workaround RPM quirk. Fix %files section
-rw-r--r--ChangeLog3
-rw-r--r--contrib/caldera/openssh.spec8
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 93b0c99d..e89d22d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
- (bal) Disable Privsep for Tru64 after pre-authentication due to issues
with SIA. Also, clean up of tru64 support patch by Chris Adams
<cmadams@hiwaay.net>
+ - (tim) [contrib/caldera/openssh.spec] workaround RPM quirk. Fix %files
20030318
- (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1238,4 +1239,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2637 2003/03/21 01:18:09 mouring Exp $
+$Id: ChangeLog,v 1.2638 2003/03/21 04:50:41 tim Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index c67e19e3..3a76231a 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -198,7 +198,7 @@ xmkmf
%Install
[ %{buildroot} != "/" ] && rm -rf %{buildroot}
-%makeinstall
+make install DESTDIR=%{buildroot}
%makeinstall -C %{askpass} \
BINDIR=%{_libexecdir} \
MANPATH=%{_mandir} \
@@ -325,6 +325,7 @@ fi
%{_bindir}/ssh-keygen
%{_bindir}/ssh-keyscan
%dir %{_libexecdir}
+%attr(4711,root,root) %{_libexecdir}/ssh-keysign
%{_sbindir}/ssh-host-keygen
%dir %{_defaultdocdir}/%{name}-%{version}
%{_defaultdocdir}/%{name}-%{version}/CREDITS
@@ -335,6 +336,8 @@ fi
%{_defaultdocdir}/%{name}-%{version}/TODO
%{_defaultdocdir}/%{name}-%{version}/faq.html
%{_mandir}/man1/*
+%{_mandir}/man8/ssh-keysign.8.gz
+%{_mandir}/man5/ssh_config.5.gz
%Files server
%defattr(-,root,root)
@@ -346,6 +349,7 @@ fi
%config %{SVIcdir}/sshd
%{_libexecdir}/sftp-server
%{_sbindir}/sshd
+%{_mandir}/man5/sshd_config.5.gz
%{_mandir}/man8/sftp-server.8.gz
%{_mandir}/man8/sshd.8.gz
@@ -360,4 +364,4 @@ fi
* Mon Jan 01 1998 ...
Template Version: 1.31
-$Id: openssh.spec,v 1.40 2003/03/19 23:52:14 djm Exp $
+$Id: openssh.spec,v 1.41 2003/03/21 04:50:41 tim Exp $