diff --git a/SPECS/docker-distribution.spec b/SPECS/docker-distribution.spec index 6ca91e8..b9911fe 100644 --- a/SPECS/docker-distribution.spec +++ b/SPECS/docker-distribution.spec @@ -33,18 +33,19 @@ # https://github.com/docker/distribution %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit a25b9ef0c9fe242ac04bb20d3a028442b7d266b6 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit0 a25b9ef0c9fe242ac04bb20d3a028442b7d266b6 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{project}-%{repo} Version: 2.6.1 -Release: 1%{?dist} +Release: 1.1.git%{shortcommit0}%{?dist} Summary: Docker toolset to pack, ship, store, and deliver content License: ASL 2.0 URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}.tar.gz +Source0: https://%{provider_prefix}/archive/%{commit0}.tar.gz Source1: %{name}.service Source2: config.yml +BuildRequires: git BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2 BuildRequires: systemd Requires(post): systemd @@ -54,8 +55,6 @@ Obsoletes: docker-registry < 0.9.1-8 Provides: docker-registry = %{version}-%{release} -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -220,7 +219,7 @@ providing packages with %{import_path} prefix. %endif %prep -%setup -q -n %{repo}-%{commit} +%autosetup -Sgit -n %{repo}-%{commit0} pushd vendor sed -i 's/elliptic.P224(), //' golang.org/x/crypto/ocsp/ocsp.go @@ -340,9 +339,12 @@ make test %endif %changelog -* Thu Apr 27 2017 Frantisek Kluknavsky - 2.6.1-1 +* Fri May 05 2017 Lokesh Mandvekar - 2.6.1-1.1.gita25b9ef - rebase to v2.6.1 +* Fri Mar 31 2017 Lokesh Mandvekar - 2.6.0-1.1 +- rebuild for all available arches on 7.4 + * Mon Jan 23 2017 Frantisek Kluknavsky - 2.6.0-1 - rebase to v2.6.0