summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--contrib/redhat/openssh.spec6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ac4eb040..fddfb1841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120010225
2 - (djm) Use %{_libexecdir} rather than hardcoded path in RPM specfile
3 Patch from Adrian Ho <lexfiend@usa.net>
4
120010224 520010224
2 - (bal) Missed part of the UNIX sockets patch. Patch by Corinna 6 - (bal) Missed part of the UNIX sockets patch. Patch by Corinna
3 Vinschen <vinschen@redhat.com> 7 Vinschen <vinschen@redhat.com>
@@ -4120,4 +4124,4 @@
4120 - Wrote replacements for strlcpy and mkdtemp 4124 - Wrote replacements for strlcpy and mkdtemp
4121 - Released 1.0pre1 4125 - Released 1.0pre1
4122 4126
4123$Id: ChangeLog,v 1.819 2001/02/24 21:41:10 mouring Exp $ 4127$Id: ChangeLog,v 1.820 2001/02/24 22:36:29 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index f27cc5504..f23468de2 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -203,12 +203,12 @@ install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
203install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd 203install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
204 204
205%if ! %{no_x11_askpass} 205%if ! %{no_x11_askpass}
206install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/x11-ssh-askpass 206install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/x11-ssh-askpass
207ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/ssh-askpass 207ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass
208%endif 208%endif
209 209
210%if ! %{no_gnome_askpass} 210%if ! %{no_gnome_askpass}
211install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass 211install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass
212%endif 212%endif
213 213
214perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* 214perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/*