diff --git a/openssh.spec b/openssh.spec index e547837058b457f0c2256fe5944fb35e58875279..2625f5ac4bb4fd9ef39a8819d86a2b98e2512206 100644 --- a/openssh.spec +++ b/openssh.spec @@ -17,8 +17,8 @@ # Do we want to link against a static libcrypto? (1=yes 0=no) %global static_libcrypto 0 -# Use GTK2 instead of GNOME in gnome-ssh-askpass -%global gtk2 1 +# Use GTK3 instead of gtk2 +%global gtk3 1 # Build position-independent executables (requires toolchain support)? %global pie 1 @@ -41,15 +41,15 @@ %{?skip_gnome_askpass:%global no_gnome_askpass 1} # Add option to build without GTK2 for older platforms with only GTK+. -# rpm -ba|--rebuild --define 'no_gtk2 1' -%{?no_gtk2:%global gtk2 0} +# rpm -ba|--rebuild --define 'no_gtk3 1' +%{?no_gtk3:%global gtk3 0} # Options for static OpenSSL link: # rpm -ba|--rebuild --define "static_openssl 1" %{?static_openssl:%global static_libcrypto 1} # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 -%define anolis_release 1 +%define anolis_release 2 %global openssh_ver 8.8p1 %global openssh_rel 1 %global pam_ssh_agent_ver 0.10.4 @@ -197,11 +197,9 @@ License: BSD Requires: /sbin/nologin %if ! %{no_gnome_askpass} -%if %{gtk2} -BuildRequires: gtk2-devel BuildRequires: libX11-devel -%else -BuildRequires: gnome-libs-devel +%if %{gtk3} +BuildRequires: gtk3-devel %endif %endif @@ -259,6 +257,8 @@ Requires: openssh = %{version}-%{release} %package askpass Summary: A passphrase dialog for OpenSSH and X Requires: openssh = %{version}-%{release} +Requires: openssh-clients = %{version}-%{release} +Requires: openssh-server = %{version}-%{release} %package -n pam_ssh_agent_auth Summary: PAM module for authentication with ssh-agent @@ -454,24 +454,20 @@ perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile %make_build -# Define a variable to toggle gnome1/gtk2 building. This is necessary +# Define a variable to toggle gtk2/gtk3 building. This is necessary # because RPM doesn't handle nested %%if statements. -%if %{gtk2} - gtk2=yes +%if %{gtk3} + gtk3=yes %else - gtk2=no + gtk3=no %endif %if ! %{no_gnome_askpass} pushd contrib -if [ $gtk2 = yes ] ; then +if [ $gtk3 = yes ] ; then CFLAGS="$CFLAGS %{?__global_ldflags}" \ - make gnome-ssh-askpass2 - mv gnome-ssh-askpass2 gnome-ssh-askpass -else - CFLAGS="$CFLAGS %{?__global_ldflags}" - make gnome-ssh-askpass1 - mv gnome-ssh-askpass1 gnome-ssh-askpass + make gnome-ssh-askpass3 + mv gnome-ssh-askpass3 gnome-ssh-askpass fi popd %endif @@ -654,5 +650,8 @@ test -f %{sysconfig_anaconda} && \ %endif %changelog +* Mon Aug 29 2022 mgb01105731 8.8p1-2 +- Use gtk3 intead of gtk2,add openssh-server and openssh-clients as Requires for openssh-askpass to make sure update + * Fri Mar 11 2022 zhang xianting - 8.8p1-1 - Initial build for Anolis v23