From c0328c519146d9e4cac0ae96300fa869e9283409 Mon Sep 17 00:00:00 2001
From: Oliver Haessler <oliver@redhat.com>
Date: Jan 02 2016 13:26:07 +0000
Subject: included patch directly into the spec file


- added new patch for using python3.4 on EPEL 7

---

diff --git a/fish-use-usrbinpython34.patch b/fish-use-usrbinpython34.patch
new file mode 100644
index 0000000..1c8b5ab
--- /dev/null
+++ b/fish-use-usrbinpython34.patch
@@ -0,0 +1,27 @@
+diff -up fish-2.1.0/share/tools/create_manpage_completions.py.orig fish-2.1.0/share/tools/create_manpage_completions.py
+--- fish-2.1.0/share/tools/create_manpage_completions.py.orig	2013-10-19 13:10:26.000000000 -0700
++++ fish-2.1.0/share/tools/create_manpage_completions.py	2013-12-13 09:35:05.528351152 -0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3.4
+ # -*- coding: utf-8 -*-
+ 
+ # Run me like this: ./create_manpage_completions.py /usr/share/man/man{1,8}/* > man_completions.fish
+diff -up fish-2.1.0/share/tools/deroff.py.orig fish-2.1.0/share/tools/deroff.py
+--- fish-2.1.0/share/tools/deroff.py.orig	2013-10-19 13:10:26.000000000 -0700
++++ fish-2.1.0/share/tools/deroff.py	2013-12-13 09:35:26.421351108 -0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3.4
+ # -*- coding: utf-8 -*-
+ 
+ """ Deroff.py, ported to Python from the venerable deroff.c """
+diff -up fish-2.1.0/share/tools/web_config/webconfig.py.orig fish-2.1.0/share/tools/web_config/webconfig.py
+--- fish-2.1.0/share/tools/web_config/webconfig.py.orig	2013-10-19 13:10:26.000000000 -0700
++++ fish-2.1.0/share/tools/web_config/webconfig.py	2013-12-13 09:35:32.681351122 -0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3.4
+ 
+ from __future__ import unicode_literals
+ # Whether we're Python 2
diff --git a/fish.spec b/fish.spec
index e1f8922..2cda1ff 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,6 +1,6 @@
 Name:                   fish
 Version:                2.2.0
-Release:                6%{?dist}
+Release:                7%{?dist}
 Summary:                A friendly interactive shell
 
 Group:                  System Environment/Shells
@@ -8,7 +8,11 @@ License:                GPLv2
 URL:                    http://fishshell.com/
 Source0:                http://fishshell.com/files/%{version}/fish-%{version}.tar.gz
 
+%if 0%{?rhel}
+Patch0:                 fish-use-usrbinpython34.patch
+%else
 Patch0:                 fish-use-usrbinpython3.patch
+%endif
 
 # Pull request #2393, hopefully fixing #2392 / rhbz #1263052
 Patch1:                 pr-2393-1.patch
@@ -16,10 +20,11 @@ Patch2:                 pr-2393-2.patch
 
 %if 0%{?rhel}
 BuildRequires:          python34-devel
+%global __python %{__python34}
 %else
 BuildRequires:          python3-devel
-%endif
 %global __python %{__python3}
+%endif
 
 BuildRequires:          ncurses-devel gettext groff doxygen
 
@@ -112,6 +117,7 @@ fi
 %changelog
 * Sat Jan 02 2016 Oliver Haessler <oliver@redhat.com> - 2.2.0-7
 - included patch directly into the spec file
+- added new patch for using python3.4 on EPEL 7
 
 * Mon Dec 21 2015 Oliver Haessler <oliver@redhat.com> - 2.2.0-6
 - added new patch for EL7 build