From 8200cc790553e78835193787802210a95ba1b7a74895d223951250b31c541ff8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 28 Jun 2024 07:42:16 +0000 Subject: [PATCH 1/2] boo#1212476 OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive-specs-b?expand=0&rev=124 --- texlive-specs-b.changes | 5 +++++ texlive-specs-b.spec | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/texlive-specs-b.changes b/texlive-specs-b.changes index b1dddb6..9d0636f 100644 --- a/texlive-specs-b.changes +++ b/texlive-specs-b.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 27 13:38:11 UTC 2024 - Dr. Werner Fink + +- Add fix for bug boo#1212476 -- fix python shebang + ------------------------------------------------------------------- Wed Mar 20 09:19:21 UTC 2024 - Dr. Werner Fink diff --git a/texlive-specs-b.spec b/texlive-specs-b.spec index 42a0ec4..7725474 100644 --- a/texlive-specs-b.spec +++ b/texlive-specs-b.spec @@ -1,5 +1,5 @@ # -# spec file for package texlive-specs-b.spec.new +# spec file for package texlive-specs-b # # Copyright (c) 2024 SUSE LLC # @@ -19,7 +19,7 @@ %define texlive_version 2024 %define texlive_previous 2022 %define texlive_release 20240311 -%define texlive_noarch 213 +%define texlive_noarch 215 %define biber_version 2.19 #!BuildIgnore: texlive @@ -55,6 +55,10 @@ %define _x11inc %{_includedir} %define _appdefdir %{_x11data}/app-defaults +%if ! %{defined python3_bin_suffix} +%global python3_bin_suffix 3 +%endif + Name: texlive-specs-b Version: 2024 Release: 0 @@ -69,7 +73,7 @@ BuildRequires: xorg-x11-fonts-core BuildRequires: xz BuildArch: noarch Summary: Meta package for b -License: BSD-3-Clause and GPL-2.0-or-later and LGPL-3.0-or-later and LPPL-1.0 and OFL-1.1 and SUSE-Public-Domain and SUSE-TeX +License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-3.0-or-later AND LPPL-1.0 AND OFL-1.1 AND SUSE-Public-Domain AND SUSE-TeX URL: https://build.opensuse.org/package/show/Publishing:TeXLive/Meta Group: Productivity/Publishing/TeX/Base Source0: texlive-specs-b-rpmlintrc @@ -22328,6 +22332,7 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : ed %{buildroot}/${scr} <<-'EOF' 1 s@/env[[:blank:]]\+@/@ + g/python/s@python[23]\?[^\s]*@python%python3_bin_suffix@ . w q @@ -22443,6 +22448,7 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : ed %{buildroot}/${scr} <<-'EOF' 1 s@/env[[:blank:]]\+@/@ + g/python/s@python[23]\?[^\s]*@python%python3_bin_suffix@ . w q @@ -22562,6 +22568,7 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : ed %{buildroot}/${scr} <<-'EOF' 1 s@/env[[:blank:]]\+@/@ + g/python/s@python[23]\?[^\s]*@python%python3_bin_suffix@ . w q From 91290629a47d5fc2ac410907b02158fcc7f563a3ba22ad8cbcf19fc38cb43007 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 3 Jul 2024 19:26:22 +0000 Subject: [PATCH 2/2] More fine tuning to catch all python3 shebangs OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive-specs-b?expand=0&rev=125 --- texlive-specs-b.changes | 5 ++++ texlive-specs-b.spec | 51 +++++++++++++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/texlive-specs-b.changes b/texlive-specs-b.changes index 9d0636f..7248f0a 100644 --- a/texlive-specs-b.changes +++ b/texlive-specs-b.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 3 08:09:23 UTC 2024 - Dr. Werner Fink + +- More fine tuning to catch all python3 shebangs + ------------------------------------------------------------------- Thu Jun 27 13:38:11 UTC 2024 - Dr. Werner Fink diff --git a/texlive-specs-b.spec b/texlive-specs-b.spec index 7725474..0ae5fa8 100644 --- a/texlive-specs-b.spec +++ b/texlive-specs-b.spec @@ -1,5 +1,5 @@ # -# spec file for package texlive-specs-b +# spec file for package texlive-specs-b.spec # # Copyright (c) 2024 SUSE LLC # @@ -14,12 +14,13 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - +##### WARNING: Please do not edit this auto generated spec file. +# %define texlive_version 2024 %define texlive_previous 2022 %define texlive_release 20240311 -%define texlive_noarch 215 +%define texlive_noarch 216 %define biber_version 2.19 #!BuildIgnore: texlive @@ -73,7 +74,7 @@ BuildRequires: xorg-x11-fonts-core BuildRequires: xz BuildArch: noarch Summary: Meta package for b -License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-3.0-or-later AND LPPL-1.0 AND OFL-1.1 AND SUSE-Public-Domain AND SUSE-TeX +License: BSD-3-Clause and GPL-2.0-or-later and LGPL-3.0-or-later and LPPL-1.0 and OFL-1.1 and SUSE-Public-Domain and SUSE-TeX URL: https://build.opensuse.org/package/show/Publishing:TeXLive/Meta Group: Productivity/Publishing/TeX/Base Source0: texlive-specs-b-rpmlintrc @@ -22298,6 +22299,45 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : test -e %{buildroot}/$scr || continue chmod 0755 %{buildroot}/$scr done + # Extend python3 scripts with major version only if any + for scr in %{_texmfdistdir}/asymptote/GUI/ContextWindow.py \ + %{_texmfdistdir}/asymptote/GUI/CustMatTransform.py \ + %{_texmfdistdir}/asymptote/GUI/DebugFlags.py \ + %{_texmfdistdir}/asymptote/GUI/GuidesManager.py \ + %{_texmfdistdir}/asymptote/GUI/InplaceAddObj.py \ + %{_texmfdistdir}/asymptote/GUI/PrimitiveShape.py \ + %{_texmfdistdir}/asymptote/GUI/SetCustomAnchor.py \ + %{_texmfdistdir}/asymptote/GUI/UndoRedoStack.py \ + %{_texmfdistdir}/asymptote/GUI/Widg_addLabel.py \ + %{_texmfdistdir}/asymptote/GUI/Widg_addPolyOpt.py \ + %{_texmfdistdir}/asymptote/GUI/Widg_editBezier.py \ + %{_texmfdistdir}/asymptote/GUI/Window1.py \ + %{_texmfdistdir}/asymptote/GUI/__init__.py \ + %{_texmfdistdir}/asymptote/GUI/labelEditor.py \ + %{_texmfdistdir}/asymptote/GUI/setup.py \ + %{_texmfdistdir}/asymptote/GUI/xasy.py \ + %{_texmfdistdir}/asymptote/GUI/xasy2asy.py \ + %{_texmfdistdir}/asymptote/GUI/xasyArgs.py \ + %{_texmfdistdir}/asymptote/GUI/xasyBezierInterface.py \ + %{_texmfdistdir}/asymptote/GUI/xasyFile.py \ + %{_texmfdistdir}/asymptote/GUI/xasyOptions.py \ + %{_texmfdistdir}/asymptote/GUI/xasyStrings.py \ + %{_texmfdistdir}/asymptote/GUI/xasySvg.py \ + %{_texmfdistdir}/asymptote/GUI/xasyTransform.py \ + %{_texmfdistdir}/asymptote/GUI/xasyUtils.py \ + %{_texmfdistdir}/asymptote/GUI/xasyValidator.py \ + %{_texmfdistdir}/asymptote/GUI/xasyVersion.py \ + %{_texmfdistdir}/asymptote/asymptote.py + do + test -e %{buildroot}/$scr || continue + ed %{buildroot}/${scr} <<-'EOF' + 1 + s@python3@python%python3_bin_suffix@ + . + w + q + EOF + done # Avoid /usr/bin/env for scr in %{_texmfdistdir}/asymptote/GUI/ContextWindow.py \ %{_texmfdistdir}/asymptote/GUI/CustMatTransform.py \ @@ -22332,7 +22372,6 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : ed %{buildroot}/${scr} <<-'EOF' 1 s@/env[[:blank:]]\+@/@ - g/python/s@python[23]\?[^\s]*@python%python3_bin_suffix@ . w q @@ -22448,7 +22487,6 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : ed %{buildroot}/${scr} <<-'EOF' 1 s@/env[[:blank:]]\+@/@ - g/python/s@python[23]\?[^\s]*@python%python3_bin_suffix@ . w q @@ -22568,7 +22606,6 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || : ed %{buildroot}/${scr} <<-'EOF' 1 s@/env[[:blank:]]\+@/@ - g/python/s@python[23]\?[^\s]*@python%python3_bin_suffix@ . w q