commit 29b73dfa411bc6898152af7ab696f6c862548559
Author: Elan Ruusamäe <[email protected]>
Date: Fri Jun 10 22:52:33 2016 +0300
up to 1.2.5.95rc1
https://github.com/mobile-shell/mosh/releases/tag/mosh-1.2.5.95rc1
dropped pld-ac support, perl 5.14 required now
mosh.spec | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/mosh.spec b/mosh.spec
index 03b99a0..6813442 100644
--- a/mosh.spec
+++ b/mosh.spec
@@ -2,24 +2,16 @@
# Conditional build:
%bcond_with agent # with ssh agent forwarding patch
-# force gcc4 for ac
-%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
-
%define protobuf_ver 2.6.1
%include /usr/lib/rpm/macros.perl
Summary: Mosh mobile shell
Name: mosh
-Version: 1.2.5
-Release: 3
+Version: 1.2.5.95rc1
+Release: 0.1
License: GPL v3+
Group: X11/Applications
-Source0: http://mosh.mit.edu/%{name}-%{version}.tar.gz
-# Source0-md5: 56d7147cf7031583ba7d8db09033e0c5
+Source0:
https://github.com/mobile-shell/mosh/releases/download/%{name}-%{version}/mosh-%{version}.tar.gz
+# Source0-md5: 669bec1a7a7daa1b7bc031818798b432
Patch0: https://github.com/keithw/mosh/pull/583.patch
# Patch0-md5: 7eb14665ef06072591e5bcd80780c0e4
URL: http://mosh.mit.edu/
@@ -32,6 +24,7 @@ BuildRequires: libutempter-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: patchutils
+BuildRequires: perl-base >= 1:5.14
BuildRequires: pkgconfig
BuildRequires: protobuf >= %{protobuf_ver}
BuildRequires: protobuf-devel >= %{protobuf_ver}
@@ -39,10 +32,6 @@ BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: sed >= 4.0
BuildRequires: zlib-devel
Requires: protobuf-libs >= %{protobuf_ver}
-# gcc4 might be installed, but not current __cc
-%if "%(echo %{cc_version} | cut -d. -f1,2)" < "4.0"
-BuildRequires: __cc >= 4.0
-%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# PLD stack protector flags are weaker than upstream, filter them out
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mosh.git/commitdiff/29b73dfa411bc6898152af7ab696f6c862548559
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
