From 0c2f32576ccd6bfc078d5d7a2f2740cb97bca08b Mon Sep 17 00:00:00 2001 From: tuibuilder_pel7x64builder0 Date: Wed, 4 Sep 2019 11:15:01 +0200 Subject: [PATCH] git-lfs package update to 2.8.0 Signed-off-by: tuibuilder_pel7x64builder0 --- SPECS/git-lfs.spec | 289 +++++---------------------------------------- 1 file changed, 31 insertions(+), 258 deletions(-) diff --git a/SPECS/git-lfs.spec b/SPECS/git-lfs.spec index 502e6b7..18b4fcf 100644 --- a/SPECS/git-lfs.spec +++ b/SPECS/git-lfs.spec @@ -1,99 +1,22 @@ -# Generate devel rpm -%global with_devel 0 -# Build project from bundled dependencies -%global with_bundled %{?rhel:1}%{!?rhel:0} -# Build with debug info rpm -%global with_debug 1 -# Run tests in check section -%global with_check %{?rhel:0}%{!?rhel:1} -# Generate unit-test rpm -%global with_unit_test 0 -# Build man pages -%global with_manpages %{?rhel:0}%{!?rhel:1} - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -%endif - -%global provider github -%global provider_tld com -%global project git-lfs -%global repo git-lfs -# https://github.com/git-lfs/git-lfs -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 9757f3f7d17e80fe1362f48c0b26eeb102af3817 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global goipath github.com/git-lfs/git-lfs Name: git-lfs -Version: 2.3.4 -Release: 6%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: Git extension for versioning large files - License: MIT URL: https://git-lfs.github.io/ -Source0: https://%{provider_prefix}/archive/v%{version}/%{name}-%{version}.tar.gz -# https://github.com/git-lfs/git-lfs/pull/2716 -Patch0001: wait-longer.patch -# https://github.com/git-lfs/git-lfs/pull/2678 -Patch0002: 4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd.patch -# Parts of https://github.com/git-lfs/git-lfs/pull/2788 -Patch0003: a393bb1d7e82b64833f7ab835ca13a7b99cb9af9.patch - -ExclusiveArch: %{go_arches} -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - -%if 0%{?with_bundled} -Provides: bundled(golang(github.com/bgentry/go-netrc/netrc)) = 9fd32a8b3d3d3f9d43c341bfe098430e07609480 -Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/kr/pty)) = 5cf931ef8f76dccd0910001d74a58a7fca84a83d -Provides: bundled(golang(github.com/olekukonko/ts)) = ecf753e7c962639ab5a1fb46f7da627d4c0a04b8 -Provides: bundled(golang(github.com/pkg/errors)) = c605e284fe17294bda444b34710735b29d1a9d90 -Provides: bundled(golang(github.com/rubyist/tracerx)) = 787959303086f44a8c361240dfac53d3e9d53ed2 -Provides: bundled(golang(github.com/spf13/cobra)) = c55cdf33856a08e4822738728b41783292812889 -Provides: bundled(golang(github.com/spf13/pflag)) = 580b9be06c33d8ba9dcc8757ea56b7642472c2f5 -Provides: bundled(golang(github.com/stretchr/testify)) = 6cb3b85ef5a0efef77caef88363ec4d4b5c0976d -Provides: bundled(golang(github.com/ThomsonReutersEikon/go-ntlm/ntlm)) = b00ec39bbdd04f845950f4dbb4fd0a2c3155e830 -Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = 6b67b3fab74d992bd07f72550006ab2c6907c416 -%else -BuildRequires: golang(github.com/bgentry/go-netrc/netrc) -BuildRequires: golang(github.com/kr/pty) -BuildRequires: golang(github.com/inconshreveable/mousetrap) -BuildRequires: golang(github.com/olekukonko/ts) -BuildRequires: golang(github.com/rubyist/tracerx) -BuildRequires: golang(github.com/spf13/cobra) -BuildRequires: golang(github.com/spf13/pflag) -BuildRequires: golang(github.com/ThomsonReutersEikon/go-ntlm/ntlm) -BuildRequires: golang(github.com/xeipuuv/gojsonpointer) -BuildRequires: golang(github.com/xeipuuv/gojsonreference) -BuildRequires: golang(github.com/xeipuuv/gojsonschema) -BuildRequires: golang(github.com/pkg/errors) -%endif - -%if 0%{?with_manpages} -# Generate mans -BuildRequires: /usr/bin/ronn -%endif - -%if 0%{?with_check} -# For tests -%if ! 0%{?with_bundled} -BuildRequires: golang(github.com/stretchr/testify) -%endif +Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-v%{version}.tar.gz +# https://github.com/git-lfs/git-lfs/issues/3798 +Patch0001: https://github.com/git-lfs/git-lfs/pull/3800.patch +Patch0002: https://github.com/git-lfs/git-lfs/pull/3771.patch +BuildRequires: golang BuildRequires: perl-Digest-SHA +BuildRequires: perl-Test-Harness # Tests require full git suite, but not generally needed. -BuildRequires: git >= 1.8.2 -%endif +BuildRequires: git >= 1.8.5 +Requires: git-core >= 1.8.5 -# https://github.com/git-lfs/git-lfs/commit/263bfd784aa0bb23e942033605fce6c870fc8e4f -# 1.8.5 needed for macOS, but 1.8.2 sufficient for Linux. -Requires: git-core >= 1.8.2 %description Git Large File Storage (LFS) replaces large files such as audio samples, @@ -101,210 +24,60 @@ videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server. -%if 0%{?with_devel} -%package -n golang-%{provider}-%{project}-%{repo}-devel +%package -n %{name}-devel Summary: %{summary} BuildArch: noarch - -%description -n golang-%{provider}-%{project}-%{repo}-devel +%description -n %{name}-devel %{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package -n golang-%{provider}-%{project}-%{repo}-unit-test-devel -Summary: Unit tests for %{name} package - -# test subpackage tests code from devel subpackage -Requires: golang-%{provider}-%{project}-%{repo}-devel = %{version}-%{release} - - -%description -n golang-%{provider}-%{project}-%{repo}-unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +This package contains library source intended for building other packages +which use import path with %{goipath} prefix. %prep %autosetup -p1 - -%if ! 0%{?with_bundled} -rm -rf vendor -%endif +# Modify Makefile so that it expects binaries where we build them. +sed -i -e 's!/bin/!/_bin/!g' t/Makefile %build -mkdir -p src/%{provider}.%{provider_tld}/%{project}/ -ln -s $(pwd) src/%{provider}.%{provider_tld}/%{project}/%{repo} -export GOPATH=$(pwd):%{gopath} - +%gobuildroot # Build manpages first (some embedding in the executable is done.) pushd docs -%if 0%{?with_manpages} -ronn --roff man/*.ronn -%endif -%gobuild -o mangen man/mangen.go -./mangen +%gobuild -o ../_bin/mangen man/mangen.go +../_bin/mangen popd - -%gobuild -o bin/git-lfs %{import_path} - -%if 0%{?with_check} +%gobuild -o _bin/git-lfs %{goipath} # Build test executables -for go in test/cmd/*.go; do - %gobuild -o "bin/$(basename $go .go)" "$go" +for go in t/cmd/*.go; do + %gobuild -o "_bin/$(basename $go .go)" "$go" done -%{gobuild} -o "bin/git-lfs-test-server-api" "test/git-lfs-test-server-api/*.go" -%endif +%gobuild -o "_bin/git-lfs-test-server-api" t/git-lfs-test-server-api/*.go %install -install -Dpm0755 bin/git-lfs %{buildroot}%{_bindir}/%{name} -%if 0%{?with_manpages} -install -d -p %{buildroot}%{_mandir}/man1/ -install -Dpm0644 docs/man/*.1 %{buildroot}%{_mandir}/man1/ -install -d -p %{buildroot}%{_mandir}/man5/ -install -Dpm0644 docs/man/*.5 %{buildroot}%{_mandir}/man5/ -%endif - -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%goinstall +install -Dpm0755 _bin/git-lfs %{buildroot}%{_bindir}/%{name} %post -%{_bindir}/%{name} install --system +%{_bindir}/%{name} install --system --skip-repo %preun -if [ $1 -gt 0 ]; then - %{_bindir}/%{name} uninstall +if [ $1 -eq 0 ]; then + %{_bindir}/%{name} uninstall --system --skip-repo fi exit 0 -%check -%if 0%{?with_check} -export GOPATH=%{buildroot}%{gopath}:$(pwd):%{gopath} -export GIT_LFS_TEST_MAXPROCS=$(getconf _NPROCESSORS_ONLN) SKIPCOMPILE=1 -pushd src/%{provider}.%{provider_tld}/%{project}/%{name} -./script/cibuild -popd -%endif - %files +%doc README.md CHANGELOG.md %license LICENSE.md %{_bindir}/%{name} -%if 0%{?with_manpages} -%{_mandir}/man1/%{name}*.1* -%{_mandir}/man5/%{name}*.5* -%endif -%if 0%{?with_devel} -%files -n golang-%{provider}-%{project}-%{repo}-devel -f devel.file-list -%license LICENSE.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif -%if 0%{?with_unit_test} && 0%{?with_devel} -%files -n golang-%{provider}-%{project}-%{repo}-unit-test-devel -f unit-test-devel.file-list +%files -n %{name}-devel -f devel.file-list %license LICENSE.md -%endif %changelog -* Thu Feb 08 2018 Elliott Sales de Andrade - 2.3.4-6 -- Add patches to build with Go 1.10. - -* Wed Feb 07 2018 Fedora Release Engineering - 2.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 04 2017 Carl George - 2.3.4-4 -- Use vendored libraries on RHEL -- Skip test on RHEL -- Don't build man pages on RHEL due to missing ronn -- Don't build html versions of man pages - -* Fri Dec 01 2017 Elliott Sales de Andrade - 2.3.4-3 -- Require git-core instead of git. - -* Fri Nov 03 2017 Elliott Sales de Andrade - 2.3.4-2 -- Patch tests to work on slow systems like arm and aarch builders. -- Fix "git lfs help" command. - -* Fri Nov 03 2017 Elliott Sales de Andrade - 2.3.4-1 -- Update to latest release. -- Run all tests during build. - -* Fri Sep 01 2017 Elliott Sales de Andrade - 2.2.1-3 -- Remove redundant doc tag on manpages. -- Use path macros in %%post/%%postun. - -* Thu Aug 31 2017 Elliott Sales de Andrade - 2.2.1-2 -- Disable unnecessary subpackages. - -* Sun Jul 30 2017 Elliott Sales de Andrade - 2.2.1-1 -- Update to latest version. - -* Wed Apr 19 2017 Elliott Sales de Andrade - 2.0.2-2 -- Patch up to build with Go 1.7 - -* Wed Apr 19 2017 Elliott Sales de Andrade - 2.0.2-1 -- Update to latest release -- Add some requested macros - -* Tue Mar 14 2017 Elliott Sales de Andrade - 2.0.1-1 -- Update to latest release -- Don't disable git-lfs globally during upgrade - -* Mon Mar 06 2017 Elliott Sales de Andrade - 2.0.0-1 -- Update to latest release - -* Sun Feb 12 2017 Elliott Sales de Andrade - 1.5.5-1 -- Update to latest release -- Add -devel and -unit-test-devel subpackages -- Add post/preun scriptlets for global enablement - -* Sun May 15 2016 Igor Gnatenko - 1.2.0-1 -- Initial package