From 20e0b1952fcd55fb467088dda51a176e2a834ce0 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: May 15 2017 11:30:16 +0000
Subject: Fix go-1.8 -X importpath/name=value syntax


---

diff --git a/source-to-image.spec b/source-to-image.spec
index 5999214..4b00cbb 100644
--- a/source-to-image.spec
+++ b/source-to-image.spec
@@ -40,7 +40,7 @@
 
 Name:           %{repo}
 Version:        1.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A tool for building artifacts from source and injecting into docker images
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
@@ -162,7 +162,11 @@ export STI_GIT_MAJOR=1.0
 export STI_GIT_MINOR=2
 export STI_GIT_VERSION=%{commit}
 
-export LDFLAGS="-X majorFromGit=%{majorFromGit} -X minorFromGit=%{minorFromGit} -X versionFromGit=%{versionFromGit} -X commitFromGit=%{commitFromGit}"
+export LDFLAGS="\
+	-X %{import_path}/pkg/version.majorFromGit=%{majorFromGit} \
+	-X %{import_path}/pkg/version.minorFromGit=%{minorFromGit} \
+	-X %{import_path}/pkg/version.versionFromGit=%{versionFromGit} \
+	-X %{import_path}/pkg/version.commitFromGit=%{commitFromGit}"
 %gobuild -o bin/s2i %{import_path}/cmd/s2i
 
 %install
@@ -218,7 +222,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %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/scm/git
 %gotest %{import_path}/pkg/scripts
 %gotest %{import_path}/pkg/tar
 %gotest %{import_path}/pkg/util
@@ -248,6 +252,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
 
 %changelog
+* Mon May 15 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.0.9-4
+- Fix go-1.8 -X importpath/name=value syntax
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild