summaryrefslogtreecommitdiff
path: root/contrib/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/redhat')
-rw-r--r--contrib/redhat/openssh.spec14
1 files changed, 11 insertions, 3 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 652cd9139..326ac143f 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -23,8 +23,13 @@
23# Use GTK2 instead of GNOME in gnome-ssh-askpass 23# Use GTK2 instead of GNOME in gnome-ssh-askpass
24%define gtk2 1 24%define gtk2 1
25 25
26# Is this build for RHL 6.x? 26# Use build6x options for older RHEL builds
27# RHEL 7 and Fedora not yet supported
28%if %{?rhel} > 6
27%define build6x 0 29%define build6x 0
30%else
31%define build6x 1
32%endif
28 33
29# Do we want kerberos5 support (1=yes 0=no) 34# Do we want kerberos5 support (1=yes 0=no)
30%define kerberos5 1 35%define kerberos5 1
@@ -84,7 +89,8 @@ PreReq: initscripts >= 5.00
84%else 89%else
85Requires: initscripts >= 5.20 90Requires: initscripts >= 5.20
86%endif 91%endif
87BuildRequires: perl, openssl-devel 92BuildRequires: perl
93BuildRequires: openssl-devel >= 0.9.8f
88BuildRequires: /bin/login 94BuildRequires: /bin/login
89%if ! %{build6x} 95%if ! %{build6x}
90BuildRequires: glibc-devel, pam 96BuildRequires: glibc-devel, pam
@@ -409,7 +415,9 @@ fi
409%changelog 415%changelog
410* Sun Nov 16 2014 Nico Kadel-Garcia <nakdel@gmail.com> 416* Sun Nov 16 2014 Nico Kadel-Garcia <nakdel@gmail.com>
411- Always include x11-ssh-askpass tarball in SRPM 417- Always include x11-ssh-askpass tarball in SRPM
412- Add BuildRequires for libXT-devel, imake, gtk2-devel for openssh-x11-aspass 418- Add openssh-x11-aspass BuildRequires for libXT-devel, imake, gtk2-devel
419- Discard obsolete '--with-rsh' configure option
420- Update openssl-devel dependency to 0.9.8f, as found in autoconf
413 421
414* Wed Jul 14 2010 Tim Rice <tim@multitalents.net> 422* Wed Jul 14 2010 Tim Rice <tim@multitalents.net>
415- test for skip_x11_askpass (line 77) should have been for no_x11_askpass 423- test for skip_x11_askpass (line 77) should have been for no_x11_askpass