From: Elan Ruusamäe <glen@delfi.ee>
Date: Tue, 9 Jun 2015 07:21:27 +0000 (+0300)
Subject: up to 1.2.4.95rc1 release branch
X-Git-Tag: auto/th/mosh-1.2.5-1~1^2~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmosh.git;a=commitdiff_plain;h=f21832d30003576f7d1e2f69dc8c632dc30c0d59;hp=501df8d16e22bc7177b9a7f6b96468714a449511

up to 1.2.4.95rc1 release branch
---

diff --git a/mosh.spec b/mosh.spec
index d2f243f..fac8e55 100644
--- a/mosh.spec
+++ b/mosh.spec
@@ -1,3 +1,6 @@
+#
+# Conditional build:
+%bcond_with	agent		# with ssh agent forwarding patch
 
 # force gcc4 for ac
 %if "%{pld_release}" == "ac"
@@ -10,12 +13,13 @@
 %include	/usr/lib/rpm/macros.perl
 Summary:	Mosh mobile shell
 Name:		mosh
-Version:	1.2.4
-Release:	4
+Version:	1.2.5
+Release:	0.1
 License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://mosh.mit.edu/%{name}-%{version}.tar.gz
-# Source0-md5:	c2d918f4d91fdc32546e2e089f9281b2
+#Source0:	http://mosh.mit.edu/%{name}-%{version}.tar.gz
+Source0:	https://github.com/cgull/mosh/archive/release-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	05511759169785ddfb4a6d48a893c9ab
 Patch100:	https://github.com/keithw/mosh/compare/%{name}-1.2.4...c6cd99b.patch
 # Patch100-md5:	3e8455f30b5fb6cd7b24a203c00a549c
 Patch0:		https://github.com/keithw/mosh/pull/583.patch
@@ -57,17 +61,21 @@ Mosh is a replacement for SSH. It's more robust and responsive,
 especially over Wi-Fi, cellular, and long-distance links.
 
 %prep
-%setup -q
+%setup -qc
+mv mosh-release-%{version}/* .
+%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
-%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' scripts/mosh
+%endif
+%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' scripts/mosh.pl
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 CPPFLAGS="-I/usr/include/ncurses"
 %configure \