summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-12-07 11:32:36 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-12-07 11:32:36 +1100
commitd35e0ef61658aa3116eebb1606fcfe6f849fdcca (patch)
tree3f36dac46966012881c92e739fbdb425e9ac9a8b
parent1533311f4ca27adf382a158e30fbb1d2c4882a62 (diff)
- (dtucker) Bug #1677: add conditionals around the source for ssh-askpass.
-rw-r--r--ChangeLog1
-rw-r--r--contrib/redhat/openssh.spec2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c3c93b6..53d89c90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
20091207
- (dtucker) Bug #1160: use pkg-config for opensc config if it's available.
Tested by Martin Paljak.
+ - (dtucker) Bug #1677: add conditionals around the source for ssh-askpass.
20091121
- (tim) [opensshd.init.in] If PidFile is set in sshd_config, use it.
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 680906cf..1bdaf2d9 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -74,7 +74,9 @@ Release: %{rel}
%endif
URL: http://www.openssh.com/portable.html
Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
+%if ! %{skip_x11_askpass}
Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
+%endif
License: BSD
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot