Accepting request 1008719 from devel:tools:scm

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

git-2.37.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a
-size 6987464

git-2.38.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
+size 7086664

git.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Oct  6 19:29:30 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- git 2.38.0:
+  * scalar: a repository management tool for large repositories
+  * new git rebase --update-refs (global rebase.updateRefs)
+    to update dependent branches
+  * merge-tree integrated with the new ort merge strategy
+    --write-tree, while --trivial-merge retains the old mode
+  * bare git repositories can now be stored and distributed
+    in other git repositories
+  * Setting the safe.bareRepository configuration to "explicit"
+    avoids running arbitrary commands from filesystem monitoring
+    hooks of untrusted git repositories unless --git-dir is set
+  * git grep: new -m / --max-count options to limit the number
+    of matches per file
+  * git ls-files --format is a new option to customize outout
+  * git cat-file and git show now support mailmap author mapping
+  * bug fixes and performance improvements
+
 -------------------------------------------------------------------
 Thu Sep 22 13:49:57 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

git.spec

@@ -36,7 +36,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.37.3
+Version:        2.38.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -78,10 +78,10 @@ BuildRequires:  zlib-devel
 Requires:       git-core = %{version}
 Requires:       perl-Git = %{version}
 Recommends:     git-email
-Suggests:       git-gui
-Suggests:       gitk
 Suggests:       git-daemon
+Suggests:       git-gui
 Suggests:       git-web
+Suggests:       gitk
 %if 0%{?suse_version} >= 1500
 BuildRequires:  openssh-clients
 BuildRequires:  sysuser-tools
@@ -264,7 +264,7 @@ Group:          Development/Tools/Version Control
 Requires:       git-core = %{version}
 Requires:       tk >= 8.4
 %if 0%{?suse_version} == 1315
-Supplements:    packageand(git-core:tk)
+Supplements:    (git-core and tk)
 %else
 Supplements:    (git-core and tk)
 %endif
@@ -283,7 +283,7 @@ Group:          Development/Tools/Version Control
 Requires:       git-core = %{version}
 Requires:       tk >= 8.4
 %if 0%{?suse_version} == 1315
-Supplements:    packageand(git-core:tk)
+Supplements:    (git-core and tk)
 %else
 Supplements:    (git-core and tk)
 %endif
@@ -305,7 +305,7 @@ Requires:       git-core = %{version}
 Requires:       perl-CGI
 Requires:       perl-Git = %{version}
 %if 0%{?suse_version} == 1315
-Supplements:    packageand(git-core:apache2)
+Supplements:    (git-core and apache2)
 %else
 Supplements:    (git-core and apache2)
 %endif
@@ -321,7 +321,7 @@ directory /git/ that calls the cgi script.
 
 %build
 # update shebang to use python3
-sed -e '1{s,.*,#!/usr/bin/python3,}' git-p4.py
+sed -e '1{s,.*,#!%{_bindir}/python3,}' git-p4.py
 cat > .make <<'EOF'
 #!/bin/bash
 %make_build CFLAGS="%{optflags}" \