2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6dda1243f..40a127a62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,10 @@
  - (djm) Manually fix up missed diff hunks (mainly RCS idents)
  - (djm) Remove UPGRADING document in favour of a link to the better 
    maintained FAQ on www.openssh.com
-
+ - (djm) Fix multiple dependancy on gnome-libs from Pekka Savola
+   <pekkas@netcore.fi>
+ - (djm) Don't need X11-askpass in RPM spec file if building without it
+   from Pekka Savola <pekkas@netcore.fi>
 20001105
  - (bal) Sync with OpenBSD:
    - markus@cvs.openbsd.org 2000/10/31 9:31:58
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index cb6007af3..9590e2a5c 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -17,14 +17,16 @@ Release: 1
 Packager: Damien Miller <djm@mindrot.org>
 URL: http://www.openssh.com/
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{oversion}.tar.gz
+%if ! %{no_x11_askpass}
 Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz 
+%endif
 Copyright: BSD
 Group: Applications/Internet
 BuildRoot: /tmp/openssh-%{version}-buildroot
 Obsoletes: ssh
 PreReq: openssl >= 0.9.5a
 Requires: openssl >= 0.9.5a
-BuildPreReq: perl, openssl-devel, tcp_wrappers, gnome-libs-devel
+BuildPreReq: perl, openssl-devel, tcp_wrappers
 BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h
 %if ! %{no_gnome_askpass}
 BuildPreReq: gnome-libs-devel
@@ -128,7 +130,11 @@ This package contains the GNOME passphrase dialog.
 
 %prep
 
+%if ! %{no_x11_askpass}
 %setup -q -a 1
+%else
+%setup -q
+%endif
 
 %build