packages: openssh/openssh.spec - fix ssh-ldap-helper path - always apply ld...

[glen]

Author: glen                         Date: Wed Sep 28 22:15:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix ssh-ldap-helper path
- always apply ldap patches, other patches depend on them, yet without ldap bcond does not exactly work

---- Files affected:
packages/openssh:
   openssh.spec (1.373 -> 1.374) 

---- Diffs:

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.373 packages/openssh/openssh.spec:1.374
--- packages/openssh/openssh.spec:1.373	Thu Sep 29 00:04:27 2011
+++ packages/openssh/openssh.spec	Thu Sep 29 00:15:31 2011
@@ -499,9 +499,9 @@
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
-%{?with_ldap:%patch4 -p1}
-%{?with_ldap:%patch5 -p1}
-%{?with_ldap:%patch8 -p1}
+%patch4 -p1
+%patch5 -p1
+%patch8 -p1
 %patch6 -p1
 %patch7 -p1
 %{?with_hpn:%patch9 -p1}
@@ -526,6 +526,9 @@
 # hack since arc4random from openbsd-compat needs symbols from libssh and vice versa
 sed -i -e 's#-lssh -lopenbsd-compat#-lssh -lopenbsd-compat -lssh#g' Makefile*
 
+grep -rl /usr/libexec/openssh/ssh-ldap-helper . | xargs \
+%{__sed} -i -e 's,/usr/libexec/openssh/ssh-ldap-helper,%{_libexecdir}/ssh-ldap-helper,'
+
 %build
 cp /usr/share/automake/config.sub .
 %{__aclocal}
@@ -541,7 +544,7 @@
 	%{?with_audit:--with-audit=linux} \
 	--with-ipaddr-display \
 	%{?with_kerberos5:--with-kerberos5=/usr} \
-	%{?with_ldap:--with-ldap} \
+	--with-ldap%{!?with_ldap:=no} \
 	%{?with_libedit:--with-libedit} \
 	--with-mantype=man \
 	--with-md5-passwords \
@@ -788,6 +791,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.374  2011/09/28 22:15:31  glen
+- fix ssh-ldap-helper path
+- always apply ldap patches, other patches depend on them, yet without ldap bcond does not exactly work
+
 Revision 1.373  2011/09/28 22:04:27  glen
 - use /etc/ldap.conf, not another copy of ldap.conf
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.373&r2=1.374&f=u