[packages/mosh] spec cleanups

glen glen at pld-linux.org
Tue Jun 9 09:25:56 CEST 2015


commit 996e4b930c1d0adb56d64bbf4e0f8a4a9e6649fe
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jun 9 10:21:27 2015 +0300

    spec cleanups
    
    - add agent bcond
    - run autoheader
    - cleanup ncurses hack

 mosh.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/mosh.spec b/mosh.spec
index d2f243f..b6188f2 100644
--- a/mosh.spec
+++ b/mosh.spec
@@ -1,3 +1,6 @@
+#
+# Conditional build:
+%bcond_without	agent		# with ssh agent forwarding patch
 
 # force gcc4 for ac
 %if "%{pld_release}" == "ac"
@@ -58,18 +61,20 @@ especially over Wi-Fi, cellular, and long-distance links.
 
 %prep
 %setup -q
+%if %{with agent}
 filterdiff -p1 -x 'debian/*' -x 'fedora/*' -x 'macosx/*' %{PATCH100} > branch.diff
 sed -i -e '/^diff /d' branch.diff
 %{__patch} -p1 < branch.diff
 %patch0 -p1
+%endif
 %{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' scripts/mosh
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-CPPFLAGS="-I/usr/include/ncurses"
 %configure \
 	--disable-silent-rules \
 	--enable-compile-warnings=error
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mosh.git/commitdiff/996e4b930c1d0adb56d64bbf4e0f8a4a9e6649fe



More information about the pld-cvs-commit mailing list