From 73bb058d0d9230c5594b2aee1f33b3dfdb12cb8b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 25 Feb 2001 09:36:29 +1100 Subject: - (djm) Use %{_libexecdir} rather than hardcoded path in RPM specfile Patch from Adrian Ho --- ChangeLog | 6 +++++- contrib/redhat/openssh.spec | 6 +++--- 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 @@ +20010225 + - (djm) Use %{_libexecdir} rather than hardcoded path in RPM specfile + Patch from Adrian Ho + 20010224 - (bal) Missed part of the UNIX sockets patch. Patch by Corinna Vinschen @@ -4120,4 +4124,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.819 2001/02/24 21:41:10 mouring Exp $ +$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 install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd %if ! %{no_x11_askpass} -install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/x11-ssh-askpass -ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/ssh-askpass +install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/x11-ssh-askpass +ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass %endif %if ! %{no_gnome_askpass} -install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass +install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass %endif perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* -- cgit v1.2.3