From 71cb283b6601fb08bec420a8c3aeb19c66821fb0 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 11 May 2018 15:56:01 +0200
Subject: [PATCH] Use /usr/bin/python3 for benchmarks scripts (#1577223)

---
 glibc-python3.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 glibc.spec          |  6 +++++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 glibc-python3.patch

diff --git a/glibc-python3.patch b/glibc-python3.patch
new file mode 100644
index 0000000..a9a7a4f
--- /dev/null
+++ b/glibc-python3.patch
@@ -0,0 +1,40 @@
+Use python3 for installed executable python scripts.
+
+Fedora is a Python3-only distribution:
+https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
+This fixes build failures where builders may strictly enforce only
+python3 during a transitional phase.
+
+Author: Carlos O'Donell <carlos@redhat.com>
+
+diff --git a/benchtests/scripts/compare_bench.py b/benchtests/scripts/compare_bench.py
+index ea25f778c09bba9d..b53beb3c6e32c3cf 100755
+--- a/benchtests/scripts/compare_bench.py
++++ b/benchtests/scripts/compare_bench.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Copyright (C) 2015-2018 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ #
+diff --git a/benchtests/scripts/import_bench.py b/benchtests/scripts/import_bench.py
+index 602b3f954d4801a6..76bf1528a5418748 100644
+--- a/benchtests/scripts/import_bench.py
++++ b/benchtests/scripts/import_bench.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Copyright (C) 2015-2018 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ #
+diff --git a/benchtests/scripts/validate_benchout.py b/benchtests/scripts/validate_benchout.py
+index 6147f05bec3a4844..9a5c7947ee4ed7e9 100755
+--- a/benchtests/scripts/validate_benchout.py
++++ b/benchtests/scripts/validate_benchout.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Copyright (C) 2014-2018 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ #
diff --git a/glibc.spec b/glibc.spec
index 052608c..f4bb6ac 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.27.9000-326-g0085be1415
 %define glibcversion 2.27.9000
-%define glibcrelease 15%{?dist}
+%define glibcrelease 16%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -161,6 +161,7 @@ Patch0019: glibc-rh1315108.patch
 Patch0020: glibc-rh1452750-allocate_once.patch
 Patch0021: glibc-rh1452750-libidn2.patch
 Patch0022: glibc-deprecate_libcrypt.patch
+Patch23: glibc-python3.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -1845,6 +1846,9 @@ fi
 %endif
 
 %changelog
+* Fri May 11 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-16
+- Use /usr/bin/python3 for benchmarks scripts (#1577223)
+
 * Thu Apr 19 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-15
 - Auto-sync with upstream branch master,
   commit 0085be1415a38b40a5a1a12e49368498f1687380.