summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-11-06 13:06:43 +1100
committerDamien Miller <djm@mindrot.org>2000-11-06 13:06:43 +1100
commit969c07e0f3fc27039dd710800534400ae841740e (patch)
tree768a24d71f0570e70103e50dfc838a8f39715d4e
parentab3605011854ca78531c87fd814031cd6b36c97e (diff)
- (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>
-rw-r--r--ChangeLog5
-rw-r--r--contrib/redhat/openssh.spec8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6dda1243..40a127a6 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 cb6007af..9590e2a5 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