Tidy up specfile

fish-use-usrbinpython3.patch

@@ -1,27 +0,0 @@
-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
- # -*- 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
- # -*- 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
- 
- from __future__ import unicode_literals
- # Whether we're Python 2

fish-use-usrbinpython34.patch

@@ -1,27 +0,0 @@
-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

fish.spec

@@ -11,19 +11,8 @@ Source0:                https://fishshell.com/files/%{version}/fish-%{version}.t
 # fish tests fail for ppc64le
 ExcludeArch:            ppc64le
 
-%if 0%{?rhel}
-Patch0:                 fish-use-usrbinpython34.patch
-%else
-Patch0:                 fish-use-usrbinpython3.patch
-%endif
-
-%if 0%{?rhel}
-BuildRequires:          python34-devel
-%global __python %{__python34}
-%else
-BuildRequires:          python3-devel
-%global __python %{__python3}
-%endif
+BuildRequires:          python%{python3_pkgversion}-devel
+%global __python %{expand:%{__python%{python3_pkgversion}}}
 
 # fish's 'math' command requires bc
 Requires:		bc
@@ -43,8 +32,11 @@ nothing to learn or configure.
 
 %prep
 %setup -q
-%patch0 -p1
 
+# Change the bundled scripts to invoke the python binary directly.
+for i in share/tools/*.py share/tools/*/*.py; do
+    sed -i -e "1 s@^#!/usr/bin/env python\$@#!%{__python}@g" "$i"
+done
 
 %build
 %configure --docdir=%{_pkgdocdir}
@@ -108,6 +100,7 @@ fi
 %changelog
 * Sun Jun 26 2016 luto@kernel.org - 2.3.0-2
 - Require bc (rhbz 1349714)
+- Improve Fedora vs EPEL compatibility in the specfile
 
 * Sun May 22 2016 luto@kernel.org - 2.3.0-1
 - Bump to 2.3.0