diff --git a/.gitignore b/.gitignore index e677599..8b48279 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /git-lfs-2.4.0.tar.gz /git-lfs-2.4.1.tar.gz /git-lfs-2.4.2.tar.gz +/git-lfs-2.5.0.tar.gz diff --git a/git-lfs.spec b/git-lfs.spec index 7079980..2cc89e4 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -28,11 +28,11 @@ # https://github.com/git-lfs/git-lfs %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 6f4b2e98e038530a3e26d26726799832290c61c4 +%global commit 9377560199b9d7cd2d3c38524a2a7f61aedc89db %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: git-lfs -Version: 2.4.2 +Version: 2.5.0 Release: 1%{?dist} Summary: Git extension for versioning large files @@ -44,7 +44,9 @@ ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aa BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %if 0%{?with_bundled} +Provides: bundled(golang(github.com/git-lfs/gitobj)) = 0fcb9c3796fa00bd974c86dc25b1919da1479007 Provides: bundled(golang(github.com/git-lfs/go-netrc/netrc)) = e0e9ca483a183481412e6f5a700ff20a36177503 +Provides: bundled(golang(github.com/git-lfs/wildmatch)) = b31c34466d64fcd421b503261f815a303e74296e Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 Provides: bundled(golang(github.com/kr/pty)) = 5cf931ef8f76dccd0910001d74a58a7fca84a83d Provides: bundled(golang(github.com/olekukonko/ts)) = ecf753e7c962639ab5a1fb46f7da627d4c0a04b8 @@ -55,12 +57,14 @@ Provides: bundled(golang(github.com/spf13/pflag)) = 580b9be06c33d8ba9dcc87 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 -Provides: bundled(golang(github.com/git-lfs/wildmatch)) = 8a0518641565a619e62a2738c7d4498fc345daf6 %else -BuildRequires: golang(github.com/git-lfs/go-netrc/netrc) -BuildRequires: golang(github.com/kr/pty) +BuildRequires: golang(github.com/git-lfs/gitobj) +BuildRequires: golang(github.com/git-lfs/go-netrc/netrc) >= 0-0.1.20180827gite0e9ca4 +BuildRequires: golang(github.com/git-lfs/wildmatch) >= 0-0.3.20180815gitb31c344 BuildRequires: golang(github.com/inconshreveable/mousetrap) +BuildRequires: golang(github.com/kr/pty) BuildRequires: golang(github.com/olekukonko/ts) +BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/rubyist/tracerx) BuildRequires: golang(github.com/spf13/cobra) BuildRequires: golang(github.com/spf13/pflag) @@ -68,8 +72,6 @@ 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) -BuildRequires: golang(github.com/git-lfs/wildmatch) %endif %if 0%{?with_manpages} @@ -83,6 +85,7 @@ BuildRequires: /usr/bin/ronn BuildRequires: golang(github.com/stretchr/testify) %endif BuildRequires: perl-Digest-SHA +BuildRequires: perl-Test-Harness # Tests require full git suite, but not generally needed. BuildRequires: git >= 1.8.2 %endif @@ -153,10 +156,10 @@ popd %if 0%{?with_check} # Build test executables -for go in test/cmd/*.go; do +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 +%gobuild -o "bin/git-lfs-test-server-api" t/git-lfs-test-server-api/*.go %endif @@ -250,6 +253,9 @@ popd %changelog +* Mon Sep 03 2018 Elliott Sales de Andrade - 2.5.0-1 +- Update to 2.5.0 + * Wed Aug 29 2018 Elliott Sales de Andrade - 2.4.2-1 - Update to 2.4.2 diff --git a/sources b/sources index 41a2fb6..89f3f64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (git-lfs-2.4.2.tar.gz) = c89a15c36b9d52091eb6e89f8e1db23b03f35333794467432ee49728ba83fc5d25d238f5df49bf736a4a3079778d70a527db01c2299ecd96a7b5f70059616967 +SHA512 (git-lfs-2.5.0.tar.gz) = e0e5a812b63d0ba8a4930921f54708b67009430ab5e4c7ec9e28ddbb5986774745707b75a9fa8695d64fd3f823af27f5590ae0bca9d3ae53d1320198e5be52c1