From 76a747bc7a71f354e3164296b72b1f5486cd70c4 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: May 21 2016 21:22:02 +0000 Subject: Update to v1.0.9 - resolves: #1273677 --- diff --git a/.gitignore b/.gitignore index d3020b2..255d2ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/v1.0.2.tar.gz -/v1.0.3.tar.gz -/v1.0.4.tar.gz +/source-to-image-f9ff77d.tar.gz diff --git a/source-to-image.spec b/source-to-image.spec index f5e964a..0c137ea 100644 --- a/source-to-image.spec +++ b/source-to-image.spec @@ -29,30 +29,29 @@ # https://github.com/openshift/source-to-image %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 00785d6c5ac3a03ac9d09ddb9c6cf0098db45147 +%global commit f9ff77d66250d5b904183fb9af0b1cb98b5aab98 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global majorFromGit 1 %global minorFromGit 0+ -%global versionFromGit v1.0.4 +%global versionFromGit v1.0.9 %global commitFromGit %{commit} Name: %{repo} -Version: 1.0.4 -Release: 3%{?dist} +Version: 1.0.9 +Release: 1%{?dist} Summary: A tool for building artifacts from source and injecting into docker images License: ASL 2.0 URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz +Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz # 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: golang +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %if ! 0%{?with_bundled} -BuildRequires: golang(github.com/docker/docker/builder/parser) BuildRequires: golang(github.com/fsouza/go-dockerclient) BuildRequires: golang(github.com/golang/glog) BuildRequires: golang(github.com/spf13/cobra) @@ -74,14 +73,12 @@ Summary: %{summary} BuildArch: noarch %if 0%{?with_check} -BuildRequires: golang(github.com/docker/docker/builder/parser) BuildRequires: golang(github.com/fsouza/go-dockerclient) BuildRequires: golang(github.com/golang/glog) BuildRequires: golang(github.com/spf13/cobra) BuildRequires: golang(github.com/spf13/pflag) %endif -Requires: golang(github.com/docker/docker/builder/parser) Requires: golang(github.com/fsouza/go-dockerclient) Requires: golang(github.com/golang/glog) Requires: golang(github.com/spf13/cobra) @@ -97,15 +94,19 @@ Provides: golang(%{import_path}/pkg/build/strategies) = %{version}-%{releas Provides: golang(%{import_path}/pkg/build/strategies/layered) = %{version}-%{release} Provides: golang(%{import_path}/pkg/build/strategies/onbuild) = %{version}-%{release} Provides: golang(%{import_path}/pkg/build/strategies/sti) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/cmd) = %{version}-%{release} Provides: golang(%{import_path}/pkg/config) = %{version}-%{release} Provides: golang(%{import_path}/pkg/create) = %{version}-%{release} Provides: golang(%{import_path}/pkg/create/templates) = %{version}-%{release} Provides: golang(%{import_path}/pkg/docker) = %{version}-%{release} Provides: golang(%{import_path}/pkg/docker/test) = %{version}-%{release} Provides: golang(%{import_path}/pkg/errors) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/git) = %{version}-%{release} Provides: golang(%{import_path}/pkg/ignore) = %{version}-%{release} Provides: golang(%{import_path}/pkg/run) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/scm) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/scm/empty) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/scm/file) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/scm/git) = %{version}-%{release} Provides: golang(%{import_path}/pkg/scripts) = %{version}-%{release} Provides: golang(%{import_path}/pkg/tar) = %{version}-%{release} Provides: golang(%{import_path}/pkg/test) = %{version}-%{release} @@ -126,7 +127,8 @@ building other packages which use import path with %package unit-test Summary: Unit tests for %{name} package # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: golang +# 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} %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests @@ -144,7 +146,7 @@ providing packages with %{import_path} prefix. %endif %prep -%setup -q -n source-to-image-%{version} +%setup -q -n %{repo}-%{commit} %build mkdir -p src/github.com/openshift @@ -161,7 +163,7 @@ export STI_GIT_MINOR=2 export STI_GIT_VERSION=%{commit} export LDFLAGS="-X majorFromGit=%{majorFromGit} -X minorFromGit=%{minorFromGit} -X versionFromGit=%{versionFromGit} -X commitFromGit=%{commitFromGit}" -go build -a -v -x -o bin/s2i %{import_path}/cmd/s2i +%gobuild -o bin/s2i %{import_path}/cmd/s2i %install install -d -p %{buildroot}%{_bindir} @@ -172,7 +174,7 @@ install -p -m 0755 bin/s2i %{buildroot}%{_bindir} 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" \! -iname "*_test.go" | grep -v "./Godeps") ; do +for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file @@ -184,7 +186,7 @@ done %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.file-list -for file in $(find . -iname "*_test.go" | grep -v "./Godeps"); do +for file in $(find . -iname "*_test.go"); do echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file @@ -208,12 +210,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %global gotest go test %endif -%gotest %{import_path}/pkg/build/strategies +%gotest %{import_path}/pkg/api +%gotest %{import_path}/pkg/api/validation %gotest %{import_path}/pkg/build/strategies/layered %gotest %{import_path}/pkg/build/strategies/onbuild %gotest %{import_path}/pkg/build/strategies/sti %gotest %{import_path}/pkg/docker %gotest %{import_path}/pkg/ignore +#%%gotest %%{import_path}/pkg/scm +%gotest %{import_path}/pkg/scm/git %gotest %{import_path}/pkg/scripts %gotest %{import_path}/pkg/tar %gotest %{import_path}/pkg/util @@ -243,6 +248,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Sat May 21 2016 jchaloup - 1.0.9-1 +- Update to v1.0.9 + resolves: #1273677 + * Mon Feb 22 2016 Fedora Release Engineering - 1.0.4-3 - https://fedoraproject.org/wiki/Changes/golang1.6 diff --git a/sources b/sources index e152085..5b661f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef18128229e59c179efb20cb29572ccd v1.0.4.tar.gz +1fdc53b38c79bd22f8d8e25f22f7bf80 source-to-image-f9ff77d.tar.gz