From a82c764461d0938739e93ee5ea3f848c5012785b Mon Sep 17 00:00:00 2001 From: Carl George Date: Mon, 4 Dec 2017 15:03:06 -0600 Subject: [PATCH] RHEL compatibility - Use vendored libraries on RHEL - Skip test on RHEL - Don't build man pages on RHEL due to missing ronn Also drop the minimum git version from 1.8.5 to 1.8.2. https://github.com/git-lfs/git-lfs/pull/1626 --- git-lfs.spec | 53 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/git-lfs.spec b/git-lfs.spec index 767eadd..071e13e 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -1,13 +1,15 @@ # Generate devel rpm %global with_devel 0 # Build project from bundled dependencies -%global with_bundled 0 +%global with_bundled %{?rhel:1}%{!?rhel:0} # Build with debug info rpm %global with_debug 1 # Run tests in check section -%global with_check 1 +%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 @@ -15,6 +17,9 @@ %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 @@ -28,7 +33,7 @@ Name: git-lfs Version: 2.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Git extension for versioning large files License: MIT @@ -38,8 +43,21 @@ Source0: https://%{provider_prefix}/archive/v%{version}/%{name}-%{version Patch0001: wait-longer.patch ExclusiveArch: %{go_arches} -BuildRequires: compiler(go-compiler) +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) @@ -52,17 +70,24 @@ 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 BuildRequires: perl-Digest-SHA # Tests require full git suite, but not generally needed. -BuildRequires: git >= 1.8.5 +BuildRequires: git >= 1.8.2 +%endif -Requires: git-core >= 1.8.5 +Requires: git-core >= 1.8.2 %description Git Large File Storage (LFS) replaces large files such as audio samples, @@ -103,8 +128,9 @@ providing packages with %{import_path} prefix. %prep %autosetup -p1 -# Unbundle libs +%if ! 0%{?with_bundled} rm -rf vendor +%endif %build @@ -114,26 +140,32 @@ export GOPATH=$(pwd):%{gopath} # Build manpages first (some embedding in the executable is done.) pushd docs +%if 0%{?with_manpages} ronn man/*.ronn +%endif %gobuild -o mangen man/mangen.go ./mangen popd %gobuild -o bin/git-lfs %{import_path} +%if 0%{?with_check} # Build test executables for go in test/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 %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} @@ -198,8 +230,10 @@ popd %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 @@ -214,6 +248,11 @@ popd %changelog +* 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 + * Fri Dec 01 2017 Elliott Sales de Andrade 2.3.4-3 - Require git-core instead of git.