From 6de7dc1416a66a53b16bd5d0590866798909a9faaf3821baa8174b3cb0c47cc9 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Wed, 21 Aug 2024 07:47:48 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/llvm16
 revision 14

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm16?expand=0&rev=8aa8475c8de1e7fa1d351b1f9f7e8399
---
 llvm16.changes |  6 ------
 llvm16.spec    | 14 --------------
 2 files changed, 20 deletions(-)

diff --git a/llvm16.changes b/llvm16.changes
index b1b339b..1b9c26e 100644
--- a/llvm16.changes
+++ b/llvm16.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Tue Jun 11 19:14:57 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
-
-- Add %python3_fix_shebang_path to fix binaries dependency on
-  /usr/bin/python3 (bsc#1212476).
-
 -------------------------------------------------------------------
 Wed Apr  3 20:18:07 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm16.spec b/llvm16.spec
index 190cead..db96606 100644
--- a/llvm16.spec
+++ b/llvm16.spec
@@ -1418,20 +1418,6 @@ python3 bin/llvm-lit -sv projects/libcxxabi/test/
 %endif
 popd
 
-# Fix shebang of Python scripts
-%{python3_fix_shebang_path %{buildroot}%{python3_sitearch}/lldb/utils/*.py \
-    %{buildroot}%{python3_sitelib}/optrecord.py \
-    %{buildroot}%{_bindir}/opt-diff \
-    %{buildroot}%{_bindir}/opt-stats \
-    %{buildroot}%{_bindir}/opt-viewer \
-    %{buildroot}%{_libdir}/clang/%{_sonum}/bin/hwasan_symbolize \
-    %{buildroot}%{_datadir}/scan-view/*.py \
-    %{buildroot}%{_libexecdir}/*
-    %{buildroot}%{_bindir}/*
-}
-# control
-grep -r "^#!.*python" %{buildroot}/ | grep -v "$(realpath %{_bindir}/python3)"
-
 # Remove files that won't be needed anymore.
 # This reduces the total amount of disk space used during build. (bnc#1074625)
 # This is meant to happen after build, install and check, but before

From 5e9575c4d7ce064f8091c30b064f822546d4d9de7b42f8414e544b9b629ed645 Mon Sep 17 00:00:00 2001
From: Aaron Puchert <aaronpuchert@alice-dsl.net>
Date: Fri, 23 Aug 2024 01:06:47 +0000
Subject: [PATCH 2/2] - Add minor version to Python shebangs. (boo#1212476) -
 Remove shebang and executable bit where not needed.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm16?expand=0&rev=36
---
 llvm16.changes |  6 ++++++
 llvm16.spec    | 20 ++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/llvm16.changes b/llvm16.changes
index 1b9c26e..504373f 100644
--- a/llvm16.changes
+++ b/llvm16.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 20 21:20:37 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Add minor version to Python shebangs. (boo#1212476)
+- Remove shebang and executable bit where not needed.
+
 -------------------------------------------------------------------
 Wed Apr  3 20:18:07 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm16.spec b/llvm16.spec
index db96606..25457a1 100644
--- a/llvm16.spec
+++ b/llvm16.spec
@@ -1322,8 +1322,8 @@ cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.llvm <<EOF
 %_llvm_with_lldb %{with lldb}
 EOF
 
-# Don't use env in shebangs, and prefer python3. (https://www.python.org/dev/peps/pep-0394/#for-python-runtime-distributors)
-for script in %{buildroot}%{_bindir}/opt-{diff,stats,viewer} \
+# Don't use env in shebangs, and prefer python3.X. (https://www.python.org/dev/peps/pep-0394/#for-python-runtime-distributors)
+sed -i -E "1s|/usr/bin/env *|/usr/bin/|; 1s|/usr/bin/python3?\$|$(realpath /usr/bin/python3)|" \
 %if %{_plv} == %{_sonum}
         %{buildroot}%{_bindir}/{{analyze,intercept}-build,clang-{format,tidy}-diff,git-clang-format,hmaptool,run-{clang-tidy,find-all-symbols},scan-{build,build-py,view}} \
         %{buildroot}%{_libexecdir}/{{analyze,intercept}-{c++,cc},{c++,ccc}-analyzer} \
@@ -1331,13 +1331,21 @@ for script in %{buildroot}%{_bindir}/opt-{diff,stats,viewer} \
 %ifarch aarch64 x86_64
         %{buildroot}%{_libdir}/clang/%{_sonum}/bin/hwasan_symbolize \
 %endif
-        %{buildroot}%{python3_sitelib}/optrecord.py; do
-    sed -i '1s|/usr/bin/env *|%{_bindir}/|;1s|/usr/bin/python$|%{_bindir}/python3|' $script
-done
+        %{buildroot}%{_bindir}/opt-{diff,stats,viewer}
+
+# Remove shebangs where not needed.
+sed -i '1{ /^#!/d }' \
+%if %{_plv} == %{_sonum}
+    %{buildroot}%{_datadir}/scan-view/{Reporter,startfile}.py \
+%endif
+%if %{with lldb_python}
+    %{buildroot}%{python3_sitearch}/lldb/utils/{in_call_stack,symbolication}.py \
+%endif
+    %{buildroot}%{python3_sitelib}/optrecord.py
 
 # Remove executable bit where not needed.
 chmod -x \
-  %{buildroot}%{python3_sitelib}/optpmap.py \
+  %{buildroot}%{python3_sitelib}/opt{pmap,record}.py \
   %{buildroot}%{_datadir}/opt-viewer/style.css \
 %if %{_plv} == %{_sonum}
   %{buildroot}%{_datadir}/bash-completion/completions/clang \