From 85febc7ff7fc264b045f5688a9cc502d143e1eb4 Mon Sep 17 00:00:00 2001
From: Andy Lutomirski <luto@amacapital.net>
Date: Dec 20 2013 18:17:19 +0000
Subject: Switch back to Python 2


---

diff --git a/fish-use-python3.patch b/fish-use-python3.patch
deleted file mode 100644
index 6ae8acb..0000000
--- a/fish-use-python3.patch
+++ /dev/null
@@ -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
- 
- # Whether we're Python 2
- import sys, os
diff --git a/fish-use-usrbinpython.patch b/fish-use-usrbinpython.patch
new file mode 100644
index 0000000..f460492
--- /dev/null
+++ b/fish-use-usrbinpython.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/python
+ # -*- 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/python
+ # -*- 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/python
+ 
+ # Whether we're Python 2
+ import sys, os
diff --git a/fish.spec b/fish.spec
index 905e889..dd1d4c1 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,6 +1,6 @@
 Name:                   fish
 Version:                2.1.0
-Release:                5%{?dist}
+Release:                6%{?dist}
 Summary:                A friendly interactive shell
 
 Group:                  System Environment/Shells
@@ -9,12 +9,9 @@ URL:                    http://fishshell.com/
 Source0:                http://fishshell.com/files/%{version}/fish-%{version}.tar.gz
 Patch0:                 fish-remove-usr-local.patch
 Patch1:                 fish-add-link-cxxflags.patch
-Patch2:                 fish-use-python3.patch
+Patch2:                 fish-use-usrbinpython.patch
 
-BuildRequires:          ncurses-devel gettext groff doxygen python3
-
-# brp-python-bytecompile doesn't parse script #! lines...
-%global __python %{__python3}
+BuildRequires:          ncurses-devel gettext groff doxygen
 
 %description
 fish is a fully-equipped command line shell (like bash or zsh) that is
@@ -29,7 +26,8 @@ nothing to learn or configure.
 %patch1 -p1
 %patch2 -p1
 
-# This requires Python2, but nothing uses it.
+# This is unused.  If we fiddle with Python versions, its presence will
+# be confusing.
 rm create_wajig_completions.py
 
 
@@ -79,6 +77,9 @@ fi
 
 
 %changelog
+* Fri Dec 20 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-6
+- Switch back to Python 2
+
 * Fri Dec 20 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-5
 - Add BR: python3 (for __pycache__)
 - Remove --without-xsel: fish dropped it in favor of a runtime check