From 69882c1f6b1802938a61fe2ad7845114a0a4ee3e Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Oct 22 2015 12:27:09 +0000
Subject: Disable tests that where removed by upstream


---

diff --git a/source-to-image.spec b/source-to-image.spec
index e651359..9e88856 100644
--- a/source-to-image.spec
+++ b/source-to-image.spec
@@ -29,7 +29,7 @@
 # https://github.com/openshift/source-to-image
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          00d1cb3cb9224bb59c0a37bb2bdd0100e20e1982
+%global commit          08e663119911bcae4ef2a243689886f36b997702
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global majorFromGit    1
@@ -40,7 +40,7 @@
 
 Name:           %{repo}
 Version:        1.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A tool for building artifacts from source and injecting into docker images
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
@@ -49,7 +49,7 @@ Source0:        https://%{provider_prefix}/archive/v%{version}.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:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+BuildRequires:  golang
 
 %if ! 0%{?with_bundled}
 BuildRequires: golang(github.com/docker/docker/builder/parser)
@@ -126,7 +126,7 @@ 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:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+BuildRequires:  golang
 
 %if 0%{?with_check}
 #Here comes all BuildRequires: PACKAGE the unit tests
@@ -213,7 +213,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %gotest %{import_path}/pkg/build/strategies/onbuild
 %gotest %{import_path}/pkg/build/strategies/sti
 %gotest %{import_path}/pkg/docker
-%gotest %{import_path}/pkg/git
 %gotest %{import_path}/pkg/ignore
 %gotest %{import_path}/pkg/scripts
 %gotest %{import_path}/pkg/tar
@@ -244,9 +243,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
 
 %changelog
-* Thu Oct 22 2015 Tomas Hrcka <thrcka@redhat.com> - 1.0.3-1
+* Thu Oct 22 2015 Tomas Hrcka <thrcka@redhat.com> - 1.0.3-2
 - Rebase to new upstream version
 - Package now provides s2i
+- Disable tests removed by upstream
 
 * Thu Sep 17 2015 Tomas Hrcka <thrcka@redhat.com> - 1.0.2-4
 - Fix dependencies