diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20010223 | 1 | 20010223 |
2 | - (bal) Fix --define rh7 in openssh.spec file. Patch by Steve Tell | 2 | - (bal) Fix --define rh7 in openssh.spec file. Patch by Steve Tell |
3 | <tell@telltronics.org> | 3 | <tell@telltronics.org> |
4 | - (bal) Patch to force OpenSSH rpm to require the same version of OpenSSL | ||
5 | that it was compiled against. Patch by Pekka Savola <pekkas@netcore.fi> | ||
4 | 6 | ||
5 | 20010222 | 7 | 20010222 |
6 | - (bal) Corrected SCO luid patch by svaughan <svaughan@asterion.com> | 8 | - (bal) Corrected SCO luid patch by svaughan <svaughan@asterion.com> |
@@ -4102,4 +4104,4 @@ | |||
4102 | - Wrote replacements for strlcpy and mkdtemp | 4104 | - Wrote replacements for strlcpy and mkdtemp |
4103 | - Released 1.0pre1 | 4105 | - Released 1.0pre1 |
4104 | 4106 | ||
4105 | $Id: ChangeLog,v 1.813 2001/02/23 04:45:15 mouring Exp $ | 4107 | $Id: ChangeLog,v 1.814 2001/02/23 04:55:46 mouring Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 1e18aa9e1..b7c25159d 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -22,6 +22,8 @@ | |||
22 | # rpm -ba|--rebuild --define "rh7 1" | 22 | # rpm -ba|--rebuild --define "rh7 1" |
23 | %{?rh7:%define redhat7 1} | 23 | %{?rh7:%define redhat7 1} |
24 | 24 | ||
25 | %define exact_openssl_version %(rpm -q openssl | cut -d - -f 2) | ||
26 | |||
25 | Summary: OpenSSH free Secure Shell (SSH) implementation | 27 | Summary: OpenSSH free Secure Shell (SSH) implementation |
26 | Name: openssh | 28 | Name: openssh |
27 | Version: %{oversion} | 29 | Version: %{oversion} |
@@ -37,6 +39,7 @@ Group: Applications/Internet | |||
37 | BuildRoot: /tmp/openssh-%{version}-buildroot | 39 | BuildRoot: /tmp/openssh-%{version}-buildroot |
38 | Obsoletes: ssh | 40 | Obsoletes: ssh |
39 | PreReq: openssl >= 0.9.5a | 41 | PreReq: openssl >= 0.9.5a |
42 | RreReq: openssl = %{exact_openssl_version} | ||
40 | Requires: openssl >= 0.9.5a | 43 | Requires: openssl >= 0.9.5a |
41 | Requires: rpm >= 3.0.5 | 44 | Requires: rpm >= 3.0.5 |
42 | BuildPreReq: perl, openssl-devel, tcp_wrappers | 45 | BuildPreReq: perl, openssl-devel, tcp_wrappers |