From 90921d14b9e0aef85b9e9aa62c7bff208462e0a0 Mon Sep 17 00:00:00 2001 From: Pokorra, Gerd Date: Sep 23 2019 06:57:01 +0000 Subject: Change patch to use explicit python3 shebangs --- diff --git a/passenger-5.0.30-explicity-python2.patch b/passenger-5.0.30-explicity-python2.patch deleted file mode 100644 index 2a1a44f..0000000 --- a/passenger-5.0.30-explicity-python2.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: passenger-5.0.30/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py -=================================================================== ---- passenger-5.0.30.orig/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py -+++ passenger-5.0.30/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - - import os - import platform -Index: passenger-5.0.30/src/helper-scripts/wsgi-loader.py -=================================================================== ---- passenger-5.0.30.orig/src/helper-scripts/wsgi-loader.py -+++ passenger-5.0.30/src/helper-scripts/wsgi-loader.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # Phusion Passenger - https://www.phusionpassenger.com/ - # Copyright (c) 2010-2014 Phusion Holding B.V. - # diff --git a/passenger-5.0.30-explicity-python3.patch b/passenger-5.0.30-explicity-python3.patch new file mode 100644 index 0000000..e28e6ea --- /dev/null +++ b/passenger-5.0.30-explicity-python3.patch @@ -0,0 +1,20 @@ +Index: passenger-5.0.30/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py +=================================================================== +--- passenger-5.0.30.orig/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py ++++ passenger-5.0.30/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import os + import platform +Index: passenger-5.0.30/src/helper-scripts/wsgi-loader.py +=================================================================== +--- passenger-5.0.30.orig/src/helper-scripts/wsgi-loader.py ++++ passenger-5.0.30/src/helper-scripts/wsgi-loader.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # Phusion Passenger - https://www.phusionpassenger.com/ + # Copyright (c) 2010-2014 Phusion Holding B.V. + # diff --git a/passenger.spec b/passenger.spec index d005afe..48d7689 100644 --- a/passenger.spec +++ b/passenger.spec @@ -15,7 +15,7 @@ Summary: Phusion Passenger application server Name: passenger Version: 5.0.30 -Release: 18%{?dist} +Release: 19%{?dist} # Passenger code uses MIT license. # Bundled(Boost) uses Boost Software License # BCrypt and Blowfish files use BSD license. @@ -37,8 +37,8 @@ Patch1: passenger-5.0.30-json.patch # Do not use calls from bundled libev - they are using only # for debug. Patch2: passenger-5.0.30-libev.patch -# Use explicit python2 shebangs -Patch3: passenger-5.0.30-explicity-python2.patch +# Use explicit python3 shebangs +Patch3: passenger-5.0.30-explicity-python3.patch Requires: rubygems # XXX: Needed to run passenger standalone @@ -282,6 +282,9 @@ export USE_VENDORED_LIBUV=false %changelog +* Mon Sep 23 2019 Gerd Pokorra - 5.0.30-19 +- Change patch to use explicit python3 shebangs + * Fri Jul 26 2019 Fedora Release Engineering - 5.0.30-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild