[packages/openssh] prevent upstream provided aclocal.m4 being overwritten

glen glen at pld-linux.org
Fri Apr 24 10:12:41 CEST 2015


commit 60e5e1f7e40075d7e5fd7300cc1412369bddba51
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Apr 24 11:12:37 2015 +0300

    prevent upstream provided aclocal.m4 being overwritten

 openssh.spec | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/openssh.spec b/openssh.spec
index a1844c2..9ffef3d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -547,6 +547,9 @@ 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,'
 
+# prevent being ovewritten by aclocal calls
+mv aclocal.m4 acinclude.m4
+
 %build
 cp /usr/share/automake/config.sub .
 %{__aclocal}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/60e5e1f7e40075d7e5fd7300cc1412369bddba51



More information about the pld-cvs-commit mailing list