!8 upgrade to 3.6.0
From: @shinwell_hu Reviewed-by: @licihua Signed-off-by: @licihua
This commit is contained in:
commit
3d53579c2c
@ -1,26 +1,15 @@
|
|||||||
From f17333fb29d81d5061c96931c0cd5135dec0ba02 Mon Sep 17 00:00:00 2001
|
--- Makefile.orig 2024-11-21 07:04:33
|
||||||
From: zhoukang <gameoverboss@163.com>
|
+++ Makefile 2025-01-14 17:39:55
|
||||||
Date: Tue, 12 Jul 2022 21:21:58 +0800
|
@@ -28,7 +28,7 @@
|
||||||
Subject: [PATCH] use vendor dir for build
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile | 20 +++++++-------------
|
|
||||||
1 file changed, 7 insertions(+), 13 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 0b73d9e..a185116 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -24,7 +24,7 @@ GO_TEST_EXTRA_ARGS =
|
|
||||||
# BUILTIN_LD_FLAGS are the internal flags used to pass to the linker. By default
|
# BUILTIN_LD_FLAGS are the internal flags used to pass to the linker. By default
|
||||||
# the config.GitCommit variable is always set via this variable, and
|
# the config.GitCommit variable is always set via this variable, and
|
||||||
# DWARF-stripping is enabled unless DWARF=YesPlease.
|
# DWARF-stripping is enabled unless DWARF=YesPlease.
|
||||||
-BUILTIN_LD_FLAGS =
|
-BUILTIN_LD_FLAGS =
|
||||||
+BUILTIN_LD_FLAGS = "-linkmode=external"
|
+BUILTIN_LD_FLAGS = "-linkmode=external"
|
||||||
ifneq ("$(VENDOR)","")
|
ifneq ("$(VENDOR)","")
|
||||||
BUILTIN_LD_FLAGS += -X github.com/git-lfs/git-lfs/config.Vendor=$(VENDOR)
|
BUILTIN_LD_FLAGS += -X 'github.com/git-lfs/git-lfs/v3/config.Vendor=$(VENDOR)'
|
||||||
endif
|
endif
|
||||||
@@ -194,8 +194,8 @@ endif
|
@@ -202,8 +202,8 @@
|
||||||
#
|
#
|
||||||
# It uses BUILD_MAIN as defined above to specify the entrypoint for building Git
|
# It uses BUILD_MAIN as defined above to specify the entrypoint for building Git
|
||||||
# LFS.
|
# LFS.
|
||||||
@ -31,16 +20,16 @@ index 0b73d9e..a185116 100644
|
|||||||
-ldflags="$(LD_FLAGS)" \
|
-ldflags="$(LD_FLAGS)" \
|
||||||
-gcflags="$(GC_FLAGS)" \
|
-gcflags="$(GC_FLAGS)" \
|
||||||
-trimpath \
|
-trimpath \
|
||||||
@@ -227,7 +227,7 @@ mangen : commands/mancontent_gen.go
|
@@ -237,7 +237,7 @@
|
||||||
# 'commands' of Git LFS. It depends upon the contents of the 'docs' directory
|
# 'commands' of Git LFS. It depends upon the contents of the 'docs' directory
|
||||||
# and converts those manpages into code.
|
# and converts those manpages into code.
|
||||||
commands/mancontent_gen.go : $(wildcard docs/man/*.ronn)
|
commands/mancontent_gen.go : $(wildcard docs/man/*.adoc)
|
||||||
- GOOS= GOARCH= $(GO) generate github.com/git-lfs/git-lfs/v3/commands
|
- GOOS= GOARCH= $(GO) generate github.com/git-lfs/git-lfs/v3/commands
|
||||||
+ @echo "delete this step"
|
+ @echo "delete this step"
|
||||||
|
|
||||||
# trgen is a shorthand for ensuring that tr/tr_gen.go is kept up-to-date with
|
# trgen is a shorthand for ensuring that tr/tr_gen.go is kept up-to-date with
|
||||||
# the contents of po/build/*.mo.
|
# the contents of po/build/*.mo.
|
||||||
@@ -238,7 +238,7 @@ trgen : tr/tr_gen.go
|
@@ -248,7 +248,7 @@
|
||||||
# 'tr' of Git LFS. It depends upon the contents of the 'po' directory
|
# 'tr' of Git LFS. It depends upon the contents of the 'po' directory
|
||||||
# and converts the .mo files.
|
# and converts the .mo files.
|
||||||
tr/tr_gen.go : $(MO)
|
tr/tr_gen.go : $(MO)
|
||||||
@ -49,7 +38,7 @@ index 0b73d9e..a185116 100644
|
|||||||
|
|
||||||
po/build:
|
po/build:
|
||||||
mkdir -p po/build
|
mkdir -p po/build
|
||||||
@@ -597,7 +597,7 @@ vendor : go.mod
|
@@ -628,7 +628,7 @@
|
||||||
.PHONY : fmt
|
.PHONY : fmt
|
||||||
ifeq ($(shell test -x "`command -v $(GOIMPORTS)`"; echo $$?),0)
|
ifeq ($(shell test -x "`command -v $(GOIMPORTS)`"; echo $$?),0)
|
||||||
fmt : $(SOURCES) | lint
|
fmt : $(SOURCES) | lint
|
||||||
@ -58,7 +47,7 @@ index 0b73d9e..a185116 100644
|
|||||||
else
|
else
|
||||||
fmt : $(SOURCES) | lint
|
fmt : $(SOURCES) | lint
|
||||||
@echo "git-lfs: skipping fmt, no goimports found at \`$(GOIMPORTS)\` ..."
|
@echo "git-lfs: skipping fmt, no goimports found at \`$(GOIMPORTS)\` ..."
|
||||||
@@ -607,13 +607,7 @@ endif
|
@@ -638,13 +638,7 @@
|
||||||
# are vendored in via vendor (see: above).
|
# are vendored in via vendor (see: above).
|
||||||
.PHONY : lint
|
.PHONY : lint
|
||||||
lint : $(SOURCES)
|
lint : $(SOURCES)
|
||||||
@ -71,8 +60,5 @@ index 0b73d9e..a185116 100644
|
|||||||
- | $(GREP) "."
|
- | $(GREP) "."
|
||||||
+ @echo "delete this step"
|
+ @echo "delete this step"
|
||||||
|
|
||||||
# generate index.txt for ronn HTML man page link generation
|
# MAN_ROFF_TARGETS is a list of all ROFF-style targets in the man pages.
|
||||||
.PHONY : index.txt
|
MAN_ROFF_TARGETS = man/man1/git-lfs-checkout.1 \
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
git-lfs-v3.6.0.tar.gz
Normal file
BIN
git-lfs-v3.6.0.tar.gz
Normal file
Binary file not shown.
13
git-lfs.spec
13
git-lfs.spec
@ -3,13 +3,14 @@
|
|||||||
|
|
||||||
# https://github.com/git-lfs/git-lfs
|
# https://github.com/git-lfs/git-lfs
|
||||||
Name: git-lfs
|
Name: git-lfs
|
||||||
Version: 3.2.0
|
Version: 3.6.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Git extension for versioning large files
|
Summary: Git extension for versioning large files
|
||||||
|
|
||||||
License: MIT and BSD and Apache-2.0 and MPL-2.0
|
License: MIT and BSD and Apache-2.0 and MPL-2.0
|
||||||
URL: https://git-lfs.github.io/
|
URL: https://git-lfs.github.io/
|
||||||
Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-v%{version}.tar.gz
|
Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-v%{version}.tar.gz
|
||||||
|
Source1: vendor.tar.gz
|
||||||
Patch6000: 0001-use-vendor-dir-for-build.patch
|
Patch6000: 0001-use-vendor-dir-for-build.patch
|
||||||
|
|
||||||
%if %{with check}
|
%if %{with check}
|
||||||
@ -30,7 +31,9 @@ storing the file contents on a remote server.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%setup
|
||||||
|
%patch -P 6000
|
||||||
|
tar zxvf %{SOURCE1}
|
||||||
cd ..
|
cd ..
|
||||||
mv %{name}-%{version} %{name}
|
mv %{name}-%{version} %{name}
|
||||||
mkdir -p %{name}-%{version}/src/github.com/git-lfs
|
mkdir -p %{name}-%{version}/src/github.com/git-lfs
|
||||||
@ -53,5 +56,11 @@ install -Dpm0755 src/github.com/git-lfs/git-lfs/bin/git-lfs %{buildroot}%{_bindi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 14 2025 Xinwei Hu <shinwell_hu@openeuler.sh> - 3.6.0-1
|
||||||
|
- Upgrade to 3.6.0
|
||||||
|
- Support multi-stage authentication with Git credential helpers and relative worktree paths
|
||||||
|
- New object transfer batch size configuration option
|
||||||
|
- More POSIX-compliant hook scripts
|
||||||
|
|
||||||
* Tue Jul 12 2022 zhoukang <gameoverboss@163.com> - 3.2.0-1
|
* Tue Jul 12 2022 zhoukang <gameoverboss@163.com> - 3.2.0-1
|
||||||
- Initial package
|
- Initial package
|
||||||
|
|||||||
BIN
vendor.tar.gz
Normal file
BIN
vendor.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user