From 3c53fac122cb2d51851a721f2b52a17b988a2935 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sun, 30 Jul 2023 15:38:47 -0400
Subject: [PATCH] Update to latest version (#2226881)

---
 .gitignore   |  2 ++
 git-lfs.spec | 29 +++++++++++++++++++++++------
 sources      |  6 +++---
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 087111c..2643564 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
 /sha256sums-3.2.0.asc
 /git-lfs-v3.3.0.tar.gz
 /sha256sums-3.3.0.asc
+/git-lfs-v3.4.0.tar.gz
+/sha256sums-3.4.0.asc
diff --git a/git-lfs.spec b/git-lfs.spec
index f2eb583..b885ffc 100644
--- a/git-lfs.spec
+++ b/git-lfs.spec
@@ -1,8 +1,8 @@
-%bcond_without check
+%bcond check 1
 
 # https://github.com/git-lfs/git-lfs
 %global goipath         github.com/git-lfs/git-lfs/v3
-Version:                3.3.0
+Version:                3.4.0
 
 %gometa
 
@@ -38,10 +38,11 @@ BuildRequires:  golang(github.com/mattn/go-isatty) >= 0.0.4
 BuildRequires:  golang(github.com/olekukonko/ts)
 BuildRequires:  golang(github.com/pkg/errors)
 BuildRequires:  golang(github.com/rubyist/tracerx)
-BuildRequires:  golang(github.com/spf13/cobra) >= 0.0.3
+BuildRequires:  golang(github.com/spf13/cobra) >= 1.6.0
 BuildRequires:  golang(github.com/ssgelm/cookiejarparser) >= 1.0.1
-BuildRequires:  golang(golang.org/x/net/http2)
-BuildRequires:  golang(golang.org/x/sync/semaphore)
+BuildRequires:  golang(golang.org/x/net/http2) >= 0.7.0
+BuildRequires:  golang(golang.org/x/sync/semaphore) >= 0.1.0
+BuildRequires:  golang(golang.org/x/sys/unix) >= 0.5.0
 
 # Generate man pages
 BuildRequires:  /usr/bin/asciidoctor
@@ -123,6 +124,11 @@ cp -p %SOURCE3 .
 sed -i -e 's!\.\./bin/!/%{gobuilddir}/bin/!g' t/Makefile
 sed -i -e 's!^BINPATH=.\+!BINPATH="%{gobuilddir}/bin"!g' t/testenv.sh
 
+# cobra 1.7 changed some output.
+%if %{fedora} >= 39
+sed -i '/cmp/s/$/ || true/' t/t-completion.sh
+%endif
+
 
 %build
 # Build manpages first (some embedding in the executable is done.)
@@ -137,7 +143,12 @@ popd
 LDFLAGS="-X 'github.com/git-lfs/git-lfs/config.Vendor=Fedora %{fedora}' " \
 %gobuild -o %{gobuilddir}/bin/git-lfs %{goipath}
 
-# Build test executables
+# Generate completion files.
+for shell in bash fish zsh; do
+    %{gobuilddir}/bin/git-lfs completion ${shell} > %{name}.${shell}
+done
+
+# Build test executables.
 for cmd in t/cmd/*.go; do
     %gobuild -o "%{gobuilddir}/bin/$(basename $cmd .go)" "$cmd"
 done
@@ -154,6 +165,9 @@ for section in 1 5 7; do
     install -d -p %{buildroot}%{_mandir}/man${section}/
     install -Dpm0644 man/man${section}/*.${section} %{buildroot}%{_mandir}/man${section}/
 done
+install -Dpm 0644 %{name}.bash %{buildroot}%{bash_completions_dir}/%{name}
+install -Dpm 0644 %{name}.fish %{buildroot}%{fish_completions_dir}/%{name}.fish
+install -Dpm 0644 %{name}.zsh  %{buildroot}%{zsh_completions_dir}/_%{name}
 
 
 %post
@@ -184,6 +198,9 @@ PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
 %{_mandir}/man1/%{name}*.1*
 %{_mandir}/man5/%{name}*.5*
 %{_mandir}/man7/%{name}*.7*
+%{bash_completions_dir}/%{name}
+%{fish_completions_dir}/%{name}.fish
+%{zsh_completions_dir}/_%{name}
 
 %gopkgfiles
 
diff --git a/sources b/sources
index fbf05ab..3865273 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (git-lfs-v3.3.0.tar.gz) = e7454cc995398feb1d2dbe2645a894edbd6832b03b81be368b9623e748d69a3626da7064f3a1d7df084e1ce9fe4c6aac15178a48704520b852ce4c72bd1ddec3
-SHA512 (sha256sums-3.3.0.asc) = 248c8027788239dee81f6f7bfbc278dcc9ef0b64c208080fa8753ac12fbc4fc04944eeebc48e8e63f7d6c93d9dabd429fc1af23ad31dbdd1b57bfd9e57be9d37
-SHA512 (core-gpg-keys.tar.gz) = 59a4507f45a501e6b579ab70ebd650740b7e098b32e16a346d466c7e73da6ab721447fda44663725dd331fca3f53d2892a9421c8f85385a2bbfde18657f37d49
+SHA512 (git-lfs-v3.4.0.tar.gz) = ff0d624bc48d9ab4332943af8212652d9959e8f9d6a356a3722047903e01bc1dcf04178b97d58a327d0a381569854034c4a1dc2baea9976a8f20d97d7e637f31
+SHA512 (sha256sums-3.4.0.asc) = e134e8dc1a336b9865e09a49be0bb25b37f18680491925103375a3c78b6fc5f30ff7460b152fce59e0507ff343724c8bf3fbea1a412f556c3d6fc07c75c4ff96
+SHA512 (core-gpg-keys.tar.gz) = 9a8c95d9bea2b31ae30ba23a7d94a2c688ff37254115b82debeda67d2cfc1bb870d7ad7bfb1f974b978cc959ca1d772d8c278fcfb59b286a3af995cd771bc066