[ranger] Fix the right file (was the source file, but upstream regenerates the

[Ben Boeckel]

commit e088ba07be251f0ada6b0d46e6c506331730c3a9
Author: Ben Boeckel <mathstuf at gmail.com>
Date:   Sat Dec 13 10:43:49 2014 -0500

    Fix the right file (was the source file, but upstream regenerates the
    
      installed file manually).

 ranger-1.6.1-untag-doc-typo.patch |   55 +++++++++++++++++++++++++------------
 ranger.spec                       |    7 ++++-
 2 files changed, 43 insertions(+), 19 deletions(-)
---
diff --git a/ranger-1.6.1-untag-doc-typo.patch b/ranger-1.6.1-untag-doc-typo.patch
index 18ccd6a..7cea31b 100644
--- a/ranger-1.6.1-untag-doc-typo.patch
+++ b/ranger-1.6.1-untag-doc-typo.patch
@@ -1,21 +1,40 @@
-commit 738a7875f4781d0d3bc53a731ebce5ff0347aef4
-Author: Ben Boeckel <mathstuf at gmail.com>
-Date:   Thu Dec 11 00:34:03 2014 -0500
+From e0a28380798568eb73c3c8b18ba947ebfdcac43e Mon Sep 17 00:00:00 2001
+From: hut <hut at lepus.uberspace.de>
+Date: Thu, 11 Dec 2014 14:17:37 +0100
+Subject: [PATCH] rebuilt man page
 
-    doc: match the default configuration for untag map
-    
-    Reported-By: Branislav Blaškovič <bblaskov at redhat.com>
+---
+ doc/ranger.1 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/doc/ranger.pod b/doc/ranger.pod
-index f9836e4..ee20ef9 100644
---- a/doc/ranger.pod
-+++ b/doc/ranger.pod
-@@ -134,7 +134,7 @@ efficiently.
- =head2 TAGS
- 
+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" "12/05/2014" "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
+@@ -160,7 +160,7 @@ commands and \fI3?\fR for settings.
+ .PP
+ The \fI\s-1README\s0\fR contains install instructions.
+ .PP
+-The file \fIHACKING.md\fR contains guidelines for code modification.
++The file \fI\s-1HACKING\s0.md\fR contains guidelines for code modification.
+ .PP
+ The directory \fIdoc/configs\fR contains configuration files.  They are usually
+ installed to \fI/usr/lib/python*/site\-packages/ranger/config\fR and can be
+@@ -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 "t" to toggle tags and "T" to remove any tags of
-+tags however you want.  Press "t" to toggle tags and "ut" to remove any tags of
- the selection. The default tag is an Asterisk ("*"), but you can use any tag by
- typing I<"<tagnameE<gt>>.
- 
+-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.spec b/ranger.spec
index 44950bf..c70586b 100644
--- a/ranger.spec
+++ b/ranger.spec
@@ -1,12 +1,13 @@
 Name:           ranger
 Version:        1.6.1
-Release:        3%{?dist}
+Release:        4%{?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
 
 BuildArch:      noarch
@@ -45,6 +46,10 @@ mv %{buildroot}%{_docdir}/%{name} rpmdocs
 
 
 %changelog
+* Sat Dec 13 2014 Ben Boeckel <mathstuf at gmail.com> - 1.6.1-4
+- Fix the right file (was the source file, but upstream regenerates the
+  installed file manually).
+
 * Thu Dec 11 2014 Ben Boeckel <mathstuf at gmail.com> - 1.6.1-3
 - Fix documentation typo