From 6612d3e25f1dac8cc64f0e9f867997d979cf9a65 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 3 Sep 2018 18:09:13 -0400 Subject: [PATCH] Switch to new Go packaging macros. --- git-lfs.spec | 191 +++++++-------------------------------------------- 1 file changed, 26 insertions(+), 165 deletions(-) diff --git a/git-lfs.spec b/git-lfs.spec index 2cc89e4..6631a43 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -1,98 +1,37 @@ -# 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} +%global goipath github.com/git-lfs/git-lfs +Version: 2.5.0 -%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 9377560199b9d7cd2d3c38524a2a7f61aedc89db -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%gometa Name: git-lfs -Version: 2.5.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 +Source0: %{gosource} -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x} -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 -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/ThomsonReutersEikon/go-ntlm/ntlm) 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) -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) -%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 +BuildRequires: golang(github.com/stretchr/testify/assert) +BuildRequires: golang(github.com/stretchr/testify/require) +BuildRequires: golang(github.com/xeipuuv/gojsonschema) 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 -# 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 +Requires: git-core >= 1.8.5 %description Git Large File Storage (LFS) replaces large files such as audio samples, @@ -100,116 +39,49 @@ 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 %{goname}-devel Summary: %{summary} BuildArch: noarch -%description -n golang-%{provider}-%{project}-%{repo}-devel +%description -n %{goname}-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 +%gosetup -q -%if ! 0%{?with_bundled} rm -rf vendor -%endif %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} +%gobuild -o _bin/git-lfs %{goipath} -%if 0%{?with_check} # Build test executables for go in t/cmd/*.go; do - %gobuild -o "bin/$(basename $go .go)" "$go" + %gobuild -o "_bin/$(basename $go .go)" "$go" done -%gobuild -o "bin/git-lfs-test-server-api" t/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} +%goinstall +install -Dpm0755 _bin/git-lfs %{buildroot}%{_bindir}/%{name} 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 %post @@ -223,33 +95,22 @@ exit 0 %check -%if 0%{?with_check} +%gochecks export GOPATH=%{buildroot}%{gopath}:$(pwd):%{gopath} export GIT_LFS_TEST_MAXPROCS=$(getconf _NPROCESSORS_ONLN) SKIPCOMPILE=1 -pushd src/%{provider}.%{provider_tld}/%{project}/%{name} +pushd _build/src/%{goipath} ./script/cibuild popd -%endif %files %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 +%files -n %{goname}-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 -%license LICENSE.md -%endif %changelog