From 9b04bcbbf16455d982786817731887876741ab6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Fri, 13 Nov 2020 18:22:49 +0100 Subject: [PATCH] Enable bundling Update to latest version --- .gitignore | 1 + git-lfs.spec | 99 ++++++++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 59 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index e2d3b5d..a66273a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /git-lfs-v2.11.0.tar.gz /git-lfs-v2.12.0.tar.gz /git-lfs-v2.12.1.tar.gz +/git-lfs-v2.13.0.tar.gz diff --git a/git-lfs.spec b/git-lfs.spec index 52adae7..81ea50e 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -2,16 +2,11 @@ # https://github.com/git-lfs/git-lfs %global goipath github.com/git-lfs/git-lfs -Version: 2.12.1 +Version: 2.13.0 %gometa -%global common_description %{expand: -Git extension for versioning large files.} - -%global golicenses LICENSE.md -%global godocs docs CHANGELOG.md CODE-OF-CONDUCT.md\\\ - CONTRIBUTING.md README.md +%global gobuilddir %{_builddir}/%{name}-%{version}/_build Name: git-lfs Release: 1%{?dist} @@ -22,29 +17,46 @@ URL: https://git-lfs.github.io/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-v%{version}.tar.gz Source1: README.Fedora -BuildRequires: golang(github.com/dpotapov/go-spnego) -BuildRequires: golang(github.com/git-lfs/gitobj/v2) >= 2 -BuildRequires: golang(github.com/git-lfs/gitobj/v2/errors) >= 2 -BuildRequires: golang(github.com/git-lfs/go-netrc/netrc) >= 0-0.1.20180827gite0e9ca4 -BuildRequires: golang(github.com/git-lfs/go-ntlm/ntlm) -BuildRequires: golang(github.com/git-lfs/wildmatch) >= 1.0.4 -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/ssgelm/cookiejarparser) >= 1.0.1 -BuildRequires: golang(golang.org/x/net/http2) -BuildRequires: golang(golang.org/x/sync/semaphore) +Provides: bundled(golang(github.com/alexbrainman/sspi)) = 4729b3d4d8581b2db83864d1018926e4154f9406 +Provides: bundled(golang(github.com/avast/retry-go)) = a322e24d96313ab405dec28ad5711f036c6d25a3 +Provides: bundled(golang(github.com/davecgh/go-spew)) = 8991bc29aa16c548c550c7ff78260e27b9ab7c73 +Provides: bundled(golang(github.com/dpotapov/go-spnego)) = c2c609116ad04b25367e2789f273aaf8d1c263da +Provides: bundled(golang(github.com/git-lfs/gitobj)) = cb39e779dc0b7949ea39318ff9345598d030d3b3 +Provides: bundled(golang(github.com/git-lfs/go-netrc)) = e0e9ca483a183481412e6f5a700ff20a36177503 +Provides: bundled(golang(github.com/git-lfs/go-ntlm)) = c5056e7fa0664ea69eed654a9618fa5e342dc347 +Provides: bundled(golang(github.com/git-lfs/wildmatch)) = 87c0f52cdf80ddb5b7de681298e5fee5898e8e16 +Provides: bundled(golang(github.com/hashicorp/go-uuid)) = 4f571afc59f3043a65f8fe6bf46d887b10a01d43 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 +Provides: bundled(golang(github.com/jcmturner/gofork)) = dc7c13fece037a4a36e2b3c69db4991498d30692 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c +Provides: bundled(golang(github.com/olekukonko/ts)) = 78ecb04241c0121483589a30b0814836a746187d +Provides: bundled(golang(github.com/pkg/errors)) = c605e284fe17294bda444b34710735b29d1a9d90 +Provides: bundled(golang(github.com/pmezard/go-difflib)) = 792786c7400a136282c1664665ae0a8db921c6c2 +Provides: bundled(golang(github.com/rubyist/tracerx)) = 787959303086f44a8c361240dfac53d3e9d53ed2 +Provides: bundled(golang(github.com/spf13/cobra)) = ef82de70bb3f60c65fb8eebacbb2d122ef517385 +Provides: bundled(golang(github.com/spf13/pflag)) = 298182f68c66c05229eb03ac171abe6e309ee79a +Provides: bundled(golang(github.com/ssgelm/cookiejarparser)) = ead01002df3bee9f6d64bfde0c7387bd2368a2e0 +Provides: bundled(golang(github.com/stretchr/testify)) = 3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9 +Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = 4e3ac2762d5f479393488629ee9370b50873b3a6 +Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7bd5415a7ac448318e64f11a24cd21e594b +Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = 6b67b3fab74d992bd07f72550006ab2c6907c416 +Provides: bundled(golang(golang.org/x/crypto)) = a29dc8fdc73485234dbef99ebedb95d2eced08de +Provides: bundled(golang(golang.org/x/net)) = 83d349e8ac1aeaa6e5b8669cbd094dccb2a7661d +Provides: bundled(golang(golang.org/x/sync)) = 37e7f081c4d4c64e13b10787722085407fe5d15f +Provides: bundled(golang(golang.org/x/sys)) = aee5d888a86055dc6ab0342f9cdc7b53aaeaec62 +Provides: bundled(golang(golang.org/x/text)) = f21a4dfb5e38f5895301dc265a8def02365cc3d0 +Provides: bundled(golang(gopkg.in/jcmturner/aescts.v1)) = f6abebb3171c4c1b1fea279cb7c7325020a26290 +Provides: bundled(golang(gopkg.in/jcmturner/dnsutils.v1)) = 13eeb8d49ffb74d7a75784c35e4d900607a3943c +Provides: bundled(golang(gopkg.in/jcmturner/gokrb5.v5)) = 32ba44ca5b42f17a4a9f33ff4305e70665a1bc0 +Provides: bundled(golang(gopkg.in/jcmturner/rpc.v0)) = 4480c480c9cd343b54b0acb5b62261cbd33d7adf +Provides: bundled(golang(gopkg.in/yaml.v2)) = 53403b58ad1b561927d19068c655246f2db79d48 # Generate man pages BuildRequires: /usr/bin/ronn + %if %{with check} # Tests -BuildRequires: golang(github.com/stretchr/testify/assert) >= 1.5.1 -BuildRequires: golang(github.com/stretchr/testify/require) >= 1.5.1 -BuildRequires: golang(github.com/xeipuuv/gojsonschema) BuildRequires: perl-Digest-SHA BuildRequires: perl-Test-Harness # Tests require full git suite, but not generally needed. @@ -59,18 +71,21 @@ videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server. -%gopkg - - %prep -%goprep -cp -p %SOURCE1 . +%autosetup -p1 -n %{name}-%{version} + +install -m 0755 -vd %{gobuilddir}/bin +install -m 0755 -vd "$(dirname %{gobuilddir}/src/%{goipath})" +ln -fs "$(pwd)" "%{gobuilddir}/src/%{goipath}" # Modify Makefile so that it expects binaries where we build them. sed -i -e 's!\.\./bin/!/%{gobuilddir}/bin/!g' t/Makefile %build +export GOPATH=%{gobuilddir}:%{gopath} +export GO111MODULE=off + # Build manpages first (some embedding in the executable is done.) pushd docs ronn --roff man/*.ronn @@ -78,36 +93,33 @@ ronn --roff man/*.ronn %{gobuilddir}/bin/mangen popd -LDFLAGS="-X 'github.com/git-lfs/git-lfs/config.Vendor=Fedora %{fedora}' " \ %gobuild -o %{gobuilddir}/bin/git-lfs %{goipath} # Build test executables +pushd %{gobuilddir}/src/%{goipath} for cmd in t/cmd/*.go; do %gobuild -o "%{gobuilddir}/bin/$(basename $cmd .go)" "$cmd" done %gobuild -o "%{gobuilddir}/bin/git-lfs-test-server-api" t/git-lfs-test-server-api/*.go +popd # Move man pages out of docs so they don't get installed twice. mv docs/man . %install -%gopkginstall +# In Fedora this is done by using %%gopkginstall install -Dpm0755 %{gobuilddir}/bin/git-lfs %{buildroot}%{_bindir}/%{name} install -d -p %{buildroot}%{_mandir}/man1/ install -Dpm0644 man/*.1 %{buildroot}%{_mandir}/man1/ install -d -p %{buildroot}%{_mandir}/man5/ install -Dpm0644 man/*.5 %{buildroot}%{_mandir}/man5/ - %post -if [ "x$(git config --type=bool --get 'fedora.git-lfs.no-modify-config')" != "xtrue" ]; then %{_bindir}/%{name} install --system --skip-repo -fi %preun -if [ $1 -eq 0 ] && \ - [ "x$(git config --type=bool --get 'fedora.git-lfs.no-modify-config')" != "xtrue" ]; then +if [ $1 -eq 0 ]; then %{_bindir}/%{name} uninstall --system --skip-repo fi exit 0 @@ -115,23 +127,26 @@ exit 0 %if %{with check} %check -%gocheck +# In Fedora this is done by using %%gocheck PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \ make -C t PROVE_EXTRA_ARGS="-j$(getconf _NPROCESSORS_ONLN)" %endif %files -%doc README.md README.Fedora CHANGELOG.md docs +# In Fedora this is done by using %%gopkgfiles +%doc README.md CHANGELOG.md docs %license LICENSE.md %{_bindir}/%{name} -%{_mandir}/man1/%{name}*.1* -%{_mandir}/man5/%{name}*.5* - -%gopkgfiles +%{_mandir}/man1/%%{name}*.1* +%{_mandir}/man5/%%{name}*.5* %changelog +* Wed Jan 06 2021 Ondřej Pohořelský - 2.13.0-1 +- Enable bundling +- Update to latest version + * Mon Nov 09 2020 Elliott Sales de Andrade - 2.12.1-1 - Update to latest version (#1894780) diff --git a/sources b/sources index 0c1be42..97adca4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (git-lfs-v2.12.1.tar.gz) = 728bf414910a9a9106ea6769b939aae9ec25976e686399d0612e8ff99131a6571641b4121cb123ad6c32fc6dd59674ca50416a48e4771924b27062326df78ce0 +SHA512 (git-lfs-v2.13.0.tar.gz) = aadeb02afb5d456a6b4ce7bf8dd8f2a0e6cb11a56f9bb60819c3a9f42b7c57365d7bd359e823163e84dcd52e433dd5ff43c81ac6b0f934d0d2e07e863cd2cb08