7.5-alt7

.gear/nxssh.spec

-%def_enable kerberos5
+%def_with kerberos5
 
 Name: nxssh
 Version: 7.5
-Release: alt6
-Summary: Openssh portable (etersoft edition)
+Release: alt7
 
-Packager: Pavel Vainerman <pv@altlinux.ru>
+Summary: Openssh portable (Etersoft edition) for using with NX
 
-Group: Networking/Remote access
 License: GPL, MIT/X11 for X11 bits
+Group: Networking/Remote access
 Url: https://github.com/openssh/openssh-portable
 
+Packager: Pavel Vainerman <pv@altlinux.ru>
+
+# Source-git: https://github.com/openssh/openssh-portable.git
 Source: %name-%version.tar
 
 Patch1: 0001-fix-openssl-1.1.patch-eterbug-12901.patch
@@ -21,12 +23,12 @@ Requires: nx-libs >= 3.5.0.31
 # optimized out: gnu-config libcom_err-devel libkrb5-devel nx perl python-base python-modules python3 python3-base zlib-devel
 BuildRequires: libjpeg-devel libpam-devel libpng-devel libssl-devel libstdc++-devel nx-libs-devel openssh-clients
 
-%if_enabled kerberos5
+%if_with kerberos5
 BuildRequires: libkrb5-devel
 %endif
 
 %description
-Openssh portable (etersoft edition)
+Openssh portable (Etersoft edition) for using with NX.
 
 %prep
 %setup
@@ -37,33 +39,31 @@ if [ -s %_libdir/libssl.so.1.1 ] ; then
 fi
 
 %build
-
+# detect config placement
+confdir=""
 [ -r "/etc/openssh/ssh_config" ] && confdir="/openssh"
 [ -r "/etc/ssh/ssh_config" ] && confdir="/ssh"
 [ -r "/etc/ssh_config" ] && confdir="/"
-
-%__subst "s|-DSSHDIR=\\\\\"\$(sysconfdir)\\\\\"|-DSSHDIR=\\\\\"\$(sysconfdir)${confdir}\\\\\"|g" Makefile.in 
-with_kerberos=
-%if_enabled kerberos5
-with_kerberos="--with-kerberos5"
-%endif
+%__subst "s|-DSSHDIR=\\\\\"\$(sysconfdir)\\\\\"|-DSSHDIR=\\\\\"\$(sysconfdir)${confdir}\\\\\"|g" Makefile.in
 
 %autoreconf
-%configure --without-zlib-version-check ${with_kerberos}
+%configure --without-zlib-version-check %{subst_with kerberos}
 %make_build || %make
 
-# check ssh config path
+echo "checking ssh config path"
 grep "/etc${confdir}/ssh_config" nxssh
 
 %install
-mkdir -p %buildroot%_bindir
-install -m755 nxssh nxsshd nxssh-keygen %buildroot%_bindir/
+mkdir -p %buildroot%_bindir/
+install -m755 nxssh %buildroot%_bindir/
 
 %files
-%_bindir/*
-
+%_bindir/nxssh
 
 %changelog
+* Sat Jun 23 2018 Vitaly Lipatov <lav@altlinux.ru> 7.5-alt7
+- cleanup spec, pack only nxssh
+
 * Wed Jun 06 2018 Etersoft Builder <builder@etersoft.ru> 7.5-alt6
 - added path validation for ssh config (eterbug #12807)