Accepting request 1178128 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/1178128
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=312

git-2.45.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb
+size 7487680

git.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri May 31 22:57:33 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Compat stub for %python3_fix_shebang_path
+
+-------------------------------------------------------------------
+Fri May 31 22:42:57 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- only call the %python3_fix_shebang_path if it is actually
+  defined. This fixes the build on 15.x
+
+-------------------------------------------------------------------
+Fri May 31 21:04:34 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 2.45.2:
+  * Revert "defense in depth" fixes from 2.45.1 broke 'git lfs' and
+   'git annex'
+
+-------------------------------------------------------------------
+Mon May 27 10:12:52 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- remove dependency on /usr/bin/python3 using
+  %python3_fix_shebang_path macro, [bsc#1212476]
+
 -------------------------------------------------------------------
 Tue May 14 22:38:09 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
 

git.spec

@@ -28,6 +28,13 @@
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
+# Compat stub for python3_fix_shebang_path
+%{?!python3_fix_shebang_path:%define python3_fix_shebang_path(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=) \\\
+    myargs="%{**}" \
+    for f in ${myargs}; do \
+        [ -f "$f" ] && sed -i -e "1s@#\\!.*python.*@#\\!$(realpath %__python3)@" $f \
+    done
+    }
 %bcond_without git_libsecret
 %bcond_without docs
 %if 0%{?suse_version} >= 1500 && %{with docs}
@@ -36,7 +43,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.45.1
+Version:        2.45.2
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -70,6 +77,8 @@ BuildRequires:  pcre2-devel
 BuildRequires:  perl-Error
 BuildRequires:  perl-MailTools
 BuildRequires:  pkgconfig
+# for the %%python3_fix_shebang_path macro
+BuildRequires:  python-rpm-macros
 BuildRequires:  python3-base
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcsh
@@ -443,6 +452,12 @@ install -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/
 
 %find_lang %{name}
 cat %{name}.lang >>bin-man-doc-files
+
+%if %{defined python3_fix_shebang_path}
+# fix shebang for git-p4 (and possibly others)
+%python3_fix_shebang_path %{buildroot}%{gitexecdir}/*
+%endif
+
 # use symlinks instead of hardlinks in sub-commands
 %fdupes -s %{buildroot}