up to RC2 (1.2.4.95rc2)

diff --git a/mosh.spec b/mosh.spec
index fac8e559b3dd16b730802176d7b66c4d69cb6bda..2fedbbb88b9cf278087fb02b3645bc50d4331cda 100644 (file)
--- a/mosh.spec
+++ b/mosh.spec
@@ -13,15 +13,13 @@
 %include       /usr/lib/rpm/macros.perl
 Summary:       Mosh mobile shell
 Name:          mosh
-Version:       1.2.5
+Version:       1.2.4.95rc2
 Release:       0.1
 License:       GPL v3+
 Group:         X11/Applications
 #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
+Source0:       https://github.com/keithw/mosh/archive/%{name}-%{version}.tar.gz
+# Source0-md5: 8ef57d233d662cfac7b28747802b346a
 Patch0:                https://github.com/keithw/mosh/pull/583.patch
 # Patch0-md5:  7eb14665ef06072591e5bcd80780c0e4
 URL:           http://mosh.mit.edu/
@@ -62,11 +60,8 @@ especially over Wi-Fi, cellular, and long-distance links.
 
 %prep
 %setup -qc
-mv mosh-release-%{version}/* .
+mv mosh-mosh-%{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
 %endif
 %{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' scripts/mosh.pl
@@ -77,7 +72,6 @@ sed -i -e '/^diff /d' branch.diff
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-CPPFLAGS="-I/usr/include/ncurses"
 %configure \
        --disable-silent-rules \
        --enable-compile-warnings=error