[feh] Rebase the prefix patch

[Ben Boeckel]

commit 7695995aa984798cb2ac344f09fcaf599cfa0c5d
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Tue Nov 22 22:16:12 2011 -0500

    Rebase the prefix patch

 feh-1.14.1-prefix.patch => feh-2.1-docdir.patch |   14 ++++----------
 feh.spec                                        |    6 +++---
 2 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/feh-1.14.1-prefix.patch b/feh-2.1-docdir.patch
similarity index 54%
rename from feh-1.14.1-prefix.patch
rename to feh-2.1-docdir.patch
index 793d3d6..698ed94 100644
--- a/feh-1.14.1-prefix.patch
+++ b/feh-2.1-docdir.patch
@@ -1,13 +1,7 @@
-diff -u -r -U5 feh-1.14.1//config.mk feh-1.14.1.prefix//config.mk
---- feh-1.14.1//config.mk	2011-05-19 16:36:13.000000000 -0400
-+++ feh-1.14.1.prefix//config.mk	2011-06-24 23:04:52.394461791 -0400
-@@ -1,16 +1,16 @@
- PACKAGE ?= feh
- VERSION ?= 1.14.1
- 
- # Prefix for all installed files
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
+diff -u -r -U5 feh-2.1/config.mk feh-2.1.docdir/config.mk
+--- feh-2.1/config.mk	2011-11-02 05:59:20.000000000 -0400
++++ feh-2.1.docdir/config.mk	2011-11-22 22:09:30.243996677 -0500
+@@ -6,11 +6,11 @@
  
  # Directories for manuals, executables, docs, data, etc.
  main_dir = ${DESTDIR}${PREFIX}
diff --git a/feh.spec b/feh.spec
index f8569fc..ea3cd69 100644
--- a/feh.spec
+++ b/feh.spec
@@ -10,7 +10,7 @@ License:        MIT
 URL:            https://derf.homelinux.org/projects/feh/
 Source0:        http://derf.homelinux.org/projects/feh/feh-%{version}.tar.bz2
 Patch0:         feh-1.10.1-dejavu.patch
-Patch1:         feh-1.14.1-prefix.patch
+Patch1:         feh-2.1-docdir.patch
 
 BuildRequires:  giblib-devel
 BuildRequires:  imlib2-devel
@@ -36,7 +36,7 @@ montages as index prints with many user-configurable options.
 %prep
 %setup -q
 %patch0 -p1 -b .dejavu
-%patch1 -p1 -b .prefix
+%patch1 -p1 -b .docdir
 
 
 %build
@@ -44,7 +44,7 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=%{buildroot}
+make install PREFIX=%{_prefix} DESTDIR=%{buildroot}
 rm %{buildroot}%{_datadir}/%{name}/fonts/yudit.ttf
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 rm -rf %{buildroot}/usr/doc