diff options
author | Darren Tucker <dtucker@dtucker.net> | 2018-02-10 10:19:16 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-02-10 10:23:00 +1100 |
commit | 9c34a76f099c4e0634bf6ecc2f40ce93925402c4 (patch) | |
tree | cab7bf12b562d139ea349e27a7fc007d48befc26 /contrib | |
parent | 04f4e8193cb5a5a751fcc356bd6656291fec539e (diff) |
Add support for compat-openssl10 build dep.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/redhat/openssh.spec | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index abd7eed67..8ba399b7e 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -24,13 +24,19 @@ | |||
24 | %define gtk2 1 | 24 | %define gtk2 1 |
25 | 25 | ||
26 | # Use build6x options for older RHEL builds | 26 | # Use build6x options for older RHEL builds |
27 | # RHEL 7 and Fedora not yet supported | 27 | # RHEL 7 not yet supported |
28 | %if 0%{?rhel} > 6 | 28 | %if 0%{?rhel} > 6 |
29 | %define build6x 0 | 29 | %define build6x 0 |
30 | %else | 30 | %else |
31 | %define build6x 1 | 31 | %define build6x 1 |
32 | %endif | 32 | %endif |
33 | 33 | ||
34 | %if 0%{?fedora} >= 26 | ||
35 | %define compat_openssl 1 | ||
36 | %else | ||
37 | %define compat_openssl 0 | ||
38 | %endif | ||
39 | |||
34 | # Do we want kerberos5 support (1=yes 0=no) | 40 | # Do we want kerberos5 support (1=yes 0=no) |
35 | %define kerberos5 1 | 41 | %define kerberos5 1 |
36 | 42 | ||
@@ -90,8 +96,12 @@ PreReq: initscripts >= 5.00 | |||
90 | Requires: initscripts >= 5.20 | 96 | Requires: initscripts >= 5.20 |
91 | %endif | 97 | %endif |
92 | BuildRequires: perl | 98 | BuildRequires: perl |
99 | %if %{compat_openssl} | ||
100 | BuildRequires: compat-openssl10-devel | ||
101 | %else | ||
93 | BuildRequires: openssl-devel >= 1.0.1 | 102 | BuildRequires: openssl-devel >= 1.0.1 |
94 | BuildRequires: openssl-devel < 1.1 | 103 | BuildRequires: openssl-devel < 1.1 |
104 | %endif | ||
95 | BuildRequires: /bin/login | 105 | BuildRequires: /bin/login |
96 | %if ! %{build6x} | 106 | %if ! %{build6x} |
97 | BuildRequires: glibc-devel, pam | 107 | BuildRequires: glibc-devel, pam |
@@ -413,6 +423,7 @@ fi | |||
413 | %changelog | 423 | %changelog |
414 | * Sat Feb 10 2018 Darren Tucker <dtucker@dtucker.net> | 424 | * Sat Feb 10 2018 Darren Tucker <dtucker@dtucker.net> |
415 | - Update openssl-devel dependency to match current requirements. | 425 | - Update openssl-devel dependency to match current requirements. |
426 | - Handle Fedora >=6 openssl 1.0 compat libs. | ||
416 | 427 | ||
417 | * Sun Nov 16 2014 Nico Kadel-Garcia <nakdel@gmail.com> | 428 | * Sun Nov 16 2014 Nico Kadel-Garcia <nakdel@gmail.com> |
418 | - Add '--mandir' and '--with-mantype' for RHEL 5 compatibility | 429 | - Add '--mandir' and '--with-mantype' for RHEL 5 compatibility |