[rpms/ranger] epel10: update to 1.7.1

[rpms/ranger] epel10: update to 1.7.1

[Ben Boeckel]

A new commit has been pushed.

Repo   : rpms/ranger
Branch : epel10
Commit : 5a4bee0e81475d2370b986300db878a9d0426fb3
Author : Ben Boeckel <mathstuf@gmail.com>
Date   : 2015-09-26T14:32:24-04:00
Stats  : +48/-59 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/ranger/c/5a4bee0e81475d2370b986300db878a9d0426fb3?branch=epel10

Log:
update to 1.7.1

---
diff --git a/.gitignore b/.gitignore
index ba0cb9b..e038d57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ranger-1.1.2.tar.gz
 /ranger-1.2.2.tar.gz
 /ranger-1.4.2.tar.gz
 /ranger-1.6.1.tar.gz
+/ranger-1.7.1.tar.gz

diff --git a/ranger-1.6.1-rifle-conf.patch b/ranger-1.6.1-rifle-conf.patch
deleted file mode 100644
index 1456997..0000000
--- a/ranger-1.6.1-rifle-conf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -u -r -U5 ranger-1.6.1/ranger/config/rifle.conf ranger-1.6.1.rifle-conf/ranger/config/rifle.conf
---- ranger-1.6.1/ranger/config/rifle.conf	2013-05-24 14:45:13.000000000 -0400
-+++ ranger-1.6.1.rifle-conf/ranger/config/rifle.conf	2015-03-02 19:54:16.588356781 -0500
-@@ -138,11 +138,11 @@
- #-------------------------------------------
- # Documents
- #-------------------------------------------
- ext pdf, has llpp,     X, flag f = llpp "$@"
- ext pdf, has zathura,  X, flag f = zathura -- "$@"
--ext pdf, has mupdf,    X, flag f = mupdf -- "$@"
-+ext pdf, has mupdf-x11,X, flag f = mupdf-x11 -- "$@"
- ext pdf, has apvlv,    X, flag f = apvlv -- "$@"
- ext pdf, has xpdf,     X, flag f = xpdf -- "$@"
- ext pdf, has evince,   X, flag f = evince -- "$@"
- ext pdf, has okular,   X, flag f = okular -- "$@"
- ext pdf, has epdfview, X, flag f = epdfview -- "$@"

diff --git a/ranger-1.6.1-untag-doc-typo.patch b/ranger-1.6.1-untag-doc-typo.patch
deleted file mode 100644
index 86855d5..0000000
--- a/ranger-1.6.1-untag-doc-typo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e0a28380798568eb73c3c8b18ba947ebfdcac43e Mon Sep 17 00:00:00 2001
-From: hut <hut@lepus.uberspace.de>
-Date: Thu, 11 Dec 2014 14:17:37 +0100
-Subject: [PATCH] rebuilt man page
-
-=== Fedora ===
-Hunks modified to apply to a vanilla 1.6.1.
-=== Fedora ===
-
----
- doc/ranger.1 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/ranger.1 b/doc/ranger.1
-index c57cce0..7f5be70 100644
---- a/doc/ranger.1
-+++ b/doc/ranger.1
-@@ -133,7 +133,7 @@
- .\" ========================================================================
- .\"
- .IX Title "RANGER 1"
--.TH RANGER 1 "ranger-1.6.1" "05/24/2013" "ranger manual"
-+.TH RANGER 1 "ranger-1.6.1" "12/11/2014" "ranger manual"
- .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
- .\" way too many mistakes in technical documents.
- .if n .ad l
-@@ -235,7 +235,7 @@ efficiently.
- .SS "\s-1TAGS\s0"
- .IX Subsection "TAGS"
- Tags are single characters which are displayed left of a filename.  You can use
--tags however you want.  Press \*(L"t\*(R" to toggle tags and \*(L"T\*(R" to remove any tags of
-+tags however you want.  Press \*(L"t\*(R" to toggle tags and \*(L"ut\*(R" to remove any tags of
- the selection. The default tag is an Asterisk (\*(L"*\*(R"), but you can use any tag by
- typing \fI"<tagname>\fR.
- .SS "\s-1PREVIEWS\s0"

diff --git a/ranger-fedora-1.6.1-rifle-conf.patch b/ranger-fedora-1.6.1-rifle-conf.patch
new file mode 100644
index 0000000..1456997
--- /dev/null
+++ b/ranger-fedora-1.6.1-rifle-conf.patch
@@ -0,0 +1,16 @@
+diff -u -r -U5 ranger-1.6.1/ranger/config/rifle.conf ranger-1.6.1.rifle-conf/ranger/config/rifle.conf
+--- ranger-1.6.1/ranger/config/rifle.conf	2013-05-24 14:45:13.000000000 -0400
++++ ranger-1.6.1.rifle-conf/ranger/config/rifle.conf	2015-03-02 19:54:16.588356781 -0500
+@@ -138,11 +138,11 @@
+ #-------------------------------------------
+ # Documents
+ #-------------------------------------------
+ ext pdf, has llpp,     X, flag f = llpp "$@"
+ ext pdf, has zathura,  X, flag f = zathura -- "$@"
+-ext pdf, has mupdf,    X, flag f = mupdf -- "$@"
++ext pdf, has mupdf-x11,X, flag f = mupdf-x11 -- "$@"
+ ext pdf, has apvlv,    X, flag f = apvlv -- "$@"
+ ext pdf, has xpdf,     X, flag f = xpdf -- "$@"
+ ext pdf, has evince,   X, flag f = evince -- "$@"
+ ext pdf, has okular,   X, flag f = okular -- "$@"
+ ext pdf, has epdfview, X, flag f = epdfview -- "$@"

diff --git a/ranger-fedora-1.7.1-w3m-img-path.patch b/ranger-fedora-1.7.1-w3m-img-path.patch
new file mode 100644
index 0000000..a0fedd0
--- /dev/null
+++ b/ranger-fedora-1.7.1-w3m-img-path.patch
@@ -0,0 +1,16 @@
+diff -u -r -U5 --no-dereference ranger-1.7.1/ranger/ext/img_display.py ranger-1.7.1.w3m-img-path/ranger/ext/img_display.py
+--- ranger-1.7.1/ranger/ext/img_display.py	2015-05-04 13:36:50.000000000 -0400
++++ ranger-1.7.1.w3m-img-path/ranger/ext/img_display.py	2015-09-26 14:30:15.297490819 -0400
+@@ -19,11 +19,11 @@
+ import sys
+ import termios
+ from ranger.core.shared import FileManagerAware
+ from subprocess import Popen, PIPE
+ 
+-W3MIMGDISPLAY_PATH = '/usr/lib/w3m/w3mimgdisplay'
++W3MIMGDISPLAY_PATH = '/usr/libexec/w3m/w3mimgdisplay'
+ W3MIMGDISPLAY_OPTIONS = []
+ 
+ class ImgDisplayUnsupportedException(Exception):
+     pass
+ 

diff --git a/ranger.spec b/ranger.spec
index 8c92055..cdab606 100644
--- a/ranger.spec
+++ b/ranger.spec
@@ -1,20 +1,24 @@
 Name:           ranger
-Version:        1.6.1
-Release:        7%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        A flexible console file manager
 
 Group:          Development/Languages
 License:        GPLv3+
 URL:            http://savannah.nongnu.org/projects/ranger/
 Source0:        http://git.savannah.gnu.org/cgit/%{name}.git/snapshot/%{name}-%{version}.tar.gz
-# Cherry-picked from upstream (no release with it yet).
-Patch0:         ranger-1.6.1-untag-doc-typo.patch
+
+# Fedora-specific patches
 # mupdf binary in Fedora is mupdf-x11
-Patch1:         ranger-1.6.1-rifle-conf.patch
+Patch100:       ranger-fedora-1.6.1-rifle-conf.patch
+# w3mimgdisplay is in /usr/libexec on Fedora
+Patch101:       ranger-fedora-1.7.1-w3m-img-path.patch
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
 
+#Suggests:       w3m-img
+
 %description
 Ranger is a free console file manager that gives you greater flexibility and a
 good overview of your files without having to leave your *nix console. It
@@ -25,8 +29,8 @@ you'll be going.
 
 %prep
 %setup -q
-%patch0 -p1 -b .untag-doc-typo
-%patch1 -p1 -b .rifle-conf
+%patch100 -p1 -b .rifle-conf
+%patch101 -p1 -b .w3m-img-path
 
 
 %build
@@ -49,6 +53,9 @@ mv %{buildroot}%{_docdir}/%{name} rpmdocs
 
 
 %changelog
+* Sat Sep 26 2015 Ben Boeckel <mathstuf@gmail.com> - 1.7.1-1
+- update to 1.7.1
+
 * Thu Sep 10 2015 Ben Boeckel <mathstuf@gmail.com> - 1.6.1-7
 - use python3
 

diff --git a/sources b/sources
index 3c29626..c1515c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c37d68a00a3b93f67d9fbe3a06cf5533  ranger-1.6.1.tar.gz
+68a891f5cdc37c5441eee32a6a2d62f0  ranger-1.7.1.tar.gz