X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mosh.spec;h=0607b9d51b1b7d2a07d325fcc54410505c00eaa2;hb=6045106f1b4962d0d039b39f86b85cfae06a9269;hp=9ec48cc4bd73f21974dfef894751e4f4e9d62782;hpb=246f59c7874fdb9c2f57d78aa9f2585ec082acc8;p=packages%2Fmosh.git

diff --git a/mosh.spec b/mosh.spec
index 9ec48cc..0607b9d 100644
--- a/mosh.spec
+++ b/mosh.spec
@@ -1,39 +1,47 @@
 #
 # Conditional build:
-%bcond_without	verbose		# verbose build (V=1)
+%bcond_with	agent		# with ssh agent forwarding patch
 
-%if "%{pld_release}" == "ac"
-# add suffix, but allow ccache, etc in ~/.rpmmacros
-%{expand:%%define	__cc	%(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
-%{expand:%%define	__cxx	%(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
-%{expand:%%define	__cpp	%(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
-%endif
-
-%include	/usr/lib/rpm/macros.perl
+%define		protobuf_ver	2.6.1
 Summary:	Mosh mobile shell
+Summary(pl.UTF-8):	Mosh - przenośna powłoka
 Name:		mosh
-Version:	1.2.2
-Release:	1
+Version:	1.3.2
+Release:	11
 License:	GPL v3+
-Group:		X11/Applications
-Source0:	https://github.com/downloads/keithw/mosh/%{name}-%{version}.tar.gz
-# Source0-md5:	7ed5b857307685794dcd120afe5bdf52
-URL:		http://mosh.mit.edu/
+Group:		Applications/Networking
+Source0:	https://mosh.org/%{name}-%{version}.tar.gz
+# Source0-md5:	5122f4d2b973ab7c38dcdac8c35cb61e
+Patch0:		https://github.com/keithw/mosh/pull/583.patch
+Patch1:		%{name}-Werror.patch
+# Patch0-md5:	7eb14665ef06072591e5bcd80780c0e4
+Patch2:		%{name}-gcc8.patch
+URL:		https://mosh.org/
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake
 BuildRequires:	binutils >= 2.20.51.0.2
 BuildRequires:	libstdc++-devel >= 5:4.0
+BuildRequires:	libtool
 BuildRequires:	libutempter-devel
 BuildRequires:	ncurses-devel
-BuildRequires:	protobuf
-BuildRequires:	protobuf-devel
+BuildRequires:	openssl-devel
+BuildRequires:	patchutils
+BuildRequires:	perl-base >= 1:5.14
+BuildRequires:	pkgconfig
+BuildRequires:	protobuf >= %{protobuf_ver}
+BuildRequires:	protobuf-devel >= %{protobuf_ver}
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
-# gcc4 might be installed, but not current __cc
-%if "%(echo %{cc_version} | cut -d. -f1,2)" < "4.0"
-BuildRequires:	__cc >= 4.0
-%endif
+Requires:	protobuf-libs >= %{protobuf_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# PLD stack protector flags are weaker than upstream, filter them out
+# https://github.com/keithw/mosh/issues/203
+%define		_ssp_cflags	%{nil}
+
+%define		specflags	-Wno-error=non-virtual-dtor
+
 %description
 Remote terminal application that allows roaming, supports intermittent
 connectivity, and provides intelligent local echo and line editing of
@@ -42,19 +50,37 @@ user keystrokes.
 Mosh is a replacement for SSH. It's more robust and responsive,
 especially over Wi-Fi, cellular, and long-distance links.
 
+%description -l pl.UTF-8
+Zdalna aplikacja terminala, pozwalająca na przemieszczanie,
+obsługująca przerywaną łączność i zapewniająca inteligentne lokalne
+echo oraz edycję linii.
+
+Mosh to zamiennik SSH. Jest potężniejszy i responsywny, w
+szczególności po połączeniach Wi-Fi, komórkowych i długodystansowych.
+
 %prep
 %setup -q
-%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' scripts/mosh
+%if %{with agent}
+%patch0 -p1
+%endif
+%patch1 -p1
+%patch2 -p1
+%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' scripts/mosh.pl
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	--enable-compile-warnings=error \
-	CPPFLAGS="-I/usr/include/ncurses"
-%{__make} \
-	%{?with_verbose:V=1}
+	--disable-silent-rules \
+	--enable-compile-warnings=error
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT