From 566d2c14c20113fccdad260f2c44ed02c35a92e1 Mon Sep 17 00:00:00 2001 From: boypt <1033514+boypt@users.noreply.github.com> Date: Wed, 31 Dec 2025 14:37:45 +0800 Subject: [PATCH] remove build6x option from el7 spec --- el7/SPECS/openssh.spec | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/el7/SPECS/openssh.spec b/el7/SPECS/openssh.spec index fcd3a65..023efc9 100644 --- a/el7/SPECS/openssh.spec +++ b/el7/SPECS/openssh.spec @@ -29,14 +29,6 @@ # Use GTK2 instead of GNOME in gnome-ssh-askpass %global gtk2 1 -# Use build6x options for older RHEL builds -# RHEL 7 not yet supported -%if 0%{?rhel} > 6 -%global build6x 0 -%else -%global build6x 1 -%endif - # Do we want kerberos5 support (1=yes 0=no) %global kerberos5 0 @@ -50,14 +42,6 @@ # rpm -ba|--rebuild --define 'no_gtk2 1' %{?no_gtk2:%global gtk2 0} -# Is this a build for RHL 6.x or earlier? -%{?build_6x:%global build6x 1} - -# If this is RHL 6.x, the default configuration has sysconfdir in /usr/etc. -%if %{build6x} -%global _sysconfdir /etc -%endif - # Options for Smartcard support: (needs libsectok and openssl-engine) # rpm -ba|--rebuild --define "smartcard 1" %{?smartcard:%global scard 1} @@ -98,22 +82,14 @@ License: BSD Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Obsoletes: ssh -%if %{build6x} -PreReq: initscripts >= 5.00 -%else Requires: initscripts >= 5.20 BuildRequires: systemd-devel -%endif BuildRequires: perl %if %{with_openssl} == 1 BuildRequires: openssl-devel %endif BuildRequires: /bin/login -%if ! %{build6x} BuildRequires: glibc-devel, pam -%else -BuildRequires: /usr/include/security/pam_appl.h -%endif %if ! %{no_x11_askpass} BuildRequires: /usr/include/X11/Xlib.h # Xt development tools @@ -142,9 +118,7 @@ Summary: The OpenSSH server daemon. Group: System Environment/Daemons Obsoletes: ssh-server Requires: openssh = %{version}-%{release}, chkconfig >= 0.9 -%if ! %{build6x} Requires: /etc/pam.d/system-auth -%endif Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units