Accepting request 814325 from home:mcepl:branches:Publishing

- Add remove_python_shebang.patch to get rid of all remaining
  python2 shebangs.

OBS-URL: https://build.opensuse.org/request/show/814325
OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=189

lyx.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jun 13 16:02:54 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Add remove_python_shebang.patch to get rid of all remaining
+  python2 shebangs.
+
 -------------------------------------------------------------------
 Mon Jun  8 11:39:08 UTC 2020 - Cor Blom <cornelis@solcon.nl>
 

lyx.spec

@@ -33,6 +33,9 @@ Source4:        README.SUSE
 # Upstream also made change to python3 in master. Because 2.3.1 is compatible with both
 # python2 and 3 we follow and switch to python3
 Patch0:         correct-shebang.patch
+# PATCH-FIX-UPSTREAM remove_python_shebang.patch mcepl@suse.com
+# remove all instances of python2 shebang lines
+Patch1:         remove_python_shebang.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bc
@@ -124,7 +127,7 @@ LyX uses ImageMagick to deal with images. For security reasons
 
 %prep
 %setup -q -n lyx-2.3.5-1
-%patch0 -p1
+%autopatch -p1
 
 %build
 #./autogen.sh

remove_python_shebang.patch

@@ -0,0 +1,177 @@
+--- a/development/cmake/doc/ReplaceValues.py
++++ b/development/cmake/doc/ReplaceValues.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ 
+ from __future__ import print_function
+ 
+--- a/development/cmake/po/cat.py
++++ b/development/cmake/po/cat.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ 
+ from __future__ import print_function
+ 
+--- a/development/cmake/po/unix2dos.py
++++ b/development/cmake/po/unix2dos.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ 
+ ###############
+ import sys
+--- a/development/tools/gen_lfuns.py
++++ b/development/tools/gen_lfuns.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file gen_lfuns.py
+--- a/development/tools/generate_symbols_images.py
++++ b/development/tools/generate_symbols_images.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file generate_symbols_images.py
+--- a/development/tools/generate_symbols_list.py
++++ b/development/tools/generate_symbols_list.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file generate_symbols_images.py
+--- a/development/tools/mergepo.py
++++ b/development/tools/mergepo.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file mergepo.py
+--- a/development/tools/unicodesymbols.py
++++ b/development/tools/unicodesymbols.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file unciodesymbols.py
+--- a/development/tools/updatedocs.py
++++ b/development/tools/updatedocs.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file updatedocs.py
+--- a/development/tools/updatelayouts.py
++++ b/development/tools/updatelayouts.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file updatelayouts.py
+--- a/po/Makefile.in
++++ b/po/Makefile.in
+@@ -14,7 +14,7 @@ VERSION = 2.3.5-1
+ PACKAGE_BUGREPORT = lyx-devel@lists.lyx.org
+ 
+ # ADDED FOR LYX
+-PYTHON = /usr/bin/python
++PYTHON = /usr/bin/python3
+ 
+ SED = /usr/bin/sed
+ SHELL = /bin/sh
+--- a/po/lyx_pot.py
++++ b/po/lyx_pot.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file lyx_pot.py
+--- a/po/postats.py
++++ b/po/postats.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ # Copyright (C) 2007 Michael Gerz <michael.gerz@teststep.org>
+ # Copyright (C) 2007 José Matos <jamatos@lyx.org>
+--- a/src/tex2lyx/test/runtests.py
++++ b/src/tex2lyx/test/runtests.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ # file src/tex2lyx/test/runtests.py
+--- a/development/autotests/keytest.py
++++ b/development/autotests/keytest.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ # This script generates hundreds of random keypresses per second,
+ #  and sends them to the lyx window
+--- a/development/keystest/cache-bisect.py
++++ b/development/keystest/cache-bisect.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ import os
+--- a/development/keystest/keytest.py
++++ b/development/keystest/keytest.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ # This script generates hundreds of random keypresses per second,
+ #  and sends them to the lyx window
+--- a/development/keystest/make_screenshot_html.py
++++ b/development/keystest/make_screenshot_html.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ import re
+ import os
+--- a/lib/examples/listerrors.lyx
++++ b/lib/examples/listerrors.lyx
+@@ -347,7 +347,7 @@ status open
+ 
+ \begin_layout Plain Layout
+ 
+-#!/usr/bin/python -tt
++#!/usr/bin/python3 -tt
+ \end_layout
+ 
+ \begin_layout Plain Layout
+--- a/lib/scripts/gnuplot2pdf.py
++++ b/lib/scripts/gnuplot2pdf.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ from subprocess import Popen, PIPE
+ from sys import argv, stderr, exit
+--- a/src/graphics/GraphicsConverter.cpp
++++ b/src/graphics/GraphicsConverter.cpp
+@@ -287,7 +287,7 @@ static void build_script(string const &
+ 	LYXERR(Debug::GRAPHICS, "build_script ... ");
+ 	typedef Graph::EdgePath EdgePath;
+ 
+-	script << "#!/usr/bin/env python\n"
++	script << "#!/usr/bin/python3\n"
+ 		  "# -*- coding: utf-8 -*-\n"
+ 		  "import os, shutil, sys\n\n"
+ 		  "def unlinkNoThrow(file):\n"