diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -3,7 +3,10 @@ | |||
3 | - (djm) Manually fix up missed diff hunks (mainly RCS idents) | 3 | - (djm) Manually fix up missed diff hunks (mainly RCS idents) |
4 | - (djm) Remove UPGRADING document in favour of a link to the better | 4 | - (djm) Remove UPGRADING document in favour of a link to the better |
5 | maintained FAQ on www.openssh.com | 5 | maintained FAQ on www.openssh.com |
6 | 6 | - (djm) Fix multiple dependancy on gnome-libs from Pekka Savola | |
7 | <pekkas@netcore.fi> | ||
8 | - (djm) Don't need X11-askpass in RPM spec file if building without it | ||
9 | from Pekka Savola <pekkas@netcore.fi> | ||
7 | 20001105 | 10 | 20001105 |
8 | - (bal) Sync with OpenBSD: | 11 | - (bal) Sync with OpenBSD: |
9 | - markus@cvs.openbsd.org 2000/10/31 9:31:58 | 12 | - 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 | |||
17 | Packager: Damien Miller <djm@mindrot.org> | 17 | Packager: Damien Miller <djm@mindrot.org> |
18 | URL: http://www.openssh.com/ | 18 | URL: http://www.openssh.com/ |
19 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{oversion}.tar.gz | 19 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{oversion}.tar.gz |
20 | %if ! %{no_x11_askpass} | ||
20 | Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz | 21 | Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz |
22 | %endif | ||
21 | Copyright: BSD | 23 | Copyright: BSD |
22 | Group: Applications/Internet | 24 | Group: Applications/Internet |
23 | BuildRoot: /tmp/openssh-%{version}-buildroot | 25 | BuildRoot: /tmp/openssh-%{version}-buildroot |
24 | Obsoletes: ssh | 26 | Obsoletes: ssh |
25 | PreReq: openssl >= 0.9.5a | 27 | PreReq: openssl >= 0.9.5a |
26 | Requires: openssl >= 0.9.5a | 28 | Requires: openssl >= 0.9.5a |
27 | BuildPreReq: perl, openssl-devel, tcp_wrappers, gnome-libs-devel | 29 | BuildPreReq: perl, openssl-devel, tcp_wrappers |
28 | BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h | 30 | BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h |
29 | %if ! %{no_gnome_askpass} | 31 | %if ! %{no_gnome_askpass} |
30 | BuildPreReq: gnome-libs-devel | 32 | BuildPreReq: gnome-libs-devel |
@@ -128,7 +130,11 @@ This package contains the GNOME passphrase dialog. | |||
128 | 130 | ||
129 | %prep | 131 | %prep |
130 | 132 | ||
133 | %if ! %{no_x11_askpass} | ||
131 | %setup -q -a 1 | 134 | %setup -q -a 1 |
135 | %else | ||
136 | %setup -q | ||
137 | %endif | ||
132 | 138 | ||
133 | %build | 139 | %build |
134 | 140 | ||