From 7f9ea98bc1eb939abbaf3c5464dcc41bb23d188a Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Jan 09 2017 07:50:29 +0000
Subject: Bump to upstream 7f8ab55aaf3b86885aa55b762e803744d1674700

- related: #1214619

---

diff --git a/.gitignore b/.gitignore
index bedfd79..c61e6e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/ginkgo-dbb5c6c.tar.gz
-/ginkgo-462326b.tar.gz
+/ginkgo-7f8ab55.tar.gz
diff --git a/golang-github-onsi-ginkgo.spec b/golang-github-onsi-ginkgo.spec
index 3af7593..0353722 100644
--- a/golang-github-onsi-ginkgo.spec
+++ b/golang-github-onsi-ginkgo.spec
@@ -1,17 +1,28 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
+# If any of the following macros should be set otherwise,
+# you can wrap any of them with the following conditions:
+# - %%if 0%%{centos} == 7
+# - %%if 0%%{?rhel} == 7
+# - %%if 0%%{?fedora} == 23
+# Or just test for particular distribution:
+# - %%if 0%%{centos}
+# - %%if 0%%{?rhel}
+# - %%if 0%%{?fedora}
+#
+# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
+# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
+# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
+
+# Generate devel rpm
 %global with_devel 1
+# Build project from bundled dependencies
 %global with_bundled 0
+# Build with debug info rpm
 %global with_debug 0
-# Cyclic dependency on gomega
+# Run tests in check section
+# Cyclic deps between gomaga and ginkgo
 %global with_check 0
+# Generate unit-test rpm
 %global with_unit_test 1
-%else
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 1
-%endif
 
 %if 0%{?with_debug}
 %global _dwz_low_mem_die_limit 0
@@ -26,12 +37,12 @@
 # https://github.com/onsi/ginkgo
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          462326b1628e124b23f42e87a8f2750e3c4e2d24
+%global commit          7f8ab55aaf3b86885aa55b762e803744d1674700
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-%{provider}-%{project}-%{repo}
 Version:        1.1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A Golang BDD Testing Framework
 License:        MIT
 URL:            https://%{provider_prefix}
@@ -40,7 +51,7 @@ Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcomm
 Patch1:         0001-Add-linux_arm64-support.patch
 
 # 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}}
+ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{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}
 
@@ -53,17 +64,8 @@ Summary:       %{summary}
 BuildArch:     noarch
 
 %if 0%{?with_check}
-BuildRequires: golang(github.com/onsi/gomega)
-BuildRequires: golang(github.com/onsi/gomega/gbytes)
-BuildRequires: golang(github.com/onsi/gomega/gexec)
-BuildRequires: golang(github.com/onsi/gomega/ghttp)
 %endif
 
-Requires:      golang(github.com/onsi/gomega)
-Requires:      golang(github.com/onsi/gomega/gbytes)
-Requires:      golang(github.com/onsi/gomega/gexec)
-Requires:      golang(github.com/onsi/gomega/ghttp)
-
 Provides:      golang(%{import_path}) = %{version}-%{release}
 Provides:      golang(%{import_path}/config) = %{version}-%{release}
 Provides:      golang(%{import_path}/ginkgo/convert) = %{version}-%{release}
@@ -92,10 +94,18 @@ Summary:         Unit tests for %{name} package
 %if 0%{?with_check}
 #Here comes all BuildRequires: PACKAGE the unit tests
 #in %%check section need for running
+BuildRequires: golang(github.com/onsi/gomega)
+BuildRequires: golang(github.com/onsi/gomega/gbytes)
+BuildRequires: golang(github.com/onsi/gomega/gexec)
+BuildRequires: golang(github.com/onsi/gomega/ghttp)
 %endif
 
 # test subpackage tests code from devel subpackage
 Requires:        %{name}-devel = %{version}-%{release}
+Requires:        golang(github.com/onsi/gomega)
+Requires:        golang(github.com/onsi/gomega/gbytes)
+Requires:        golang(github.com/onsi/gomega/gexec)
+Requires:        golang(github.com/onsi/gomega/ghttp)
 
 %description unit-test
 %{summary}
@@ -114,38 +124,56 @@ providing packages with %{import_path} prefix.
 # source codes for building projects
 %if 0%{?with_devel}
 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") ; do
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
+for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
+    dirprefix=$(dirname $file)
+    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
     cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
     echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
+
+    while [ "$dirprefix" != "." ]; do
+        echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+        dirprefix=$(dirname $dirprefix)
+    done
 done
 %endif
 
 # testing files for this project
-%if 0%{?with_unit_test}
+%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"); do
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
+# find all *_test.go files and generate unit-test-devel.file-list
+for file in $(find . -iname "*_test.go") ; do
+    dirprefix=$(dirname $file)
+    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
     cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
+    echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
+
+    while [ "$dirprefix" != "." ]; do
+        echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+        dirprefix=$(dirname $dirprefix)
+    done
 done
 %endif
 
+%if 0%{?with_devel}
+sort -u -o devel.file-list devel.file-list
+%endif
+
 %check
 %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
 %if ! 0%{?with_bundled}
 export GOPATH=%{buildroot}/%{gopath}:%{gopath}
 %else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
+# No dependency directories so far
+
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
 %endif
 
 %if ! 0%{?gotest:1}
 %global gotest go test
 %endif
 
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
 %gotest %{import_path}/ginkgo/nodot
 %gotest %{import_path}/ginkgo/testsuite
 %gotest %{import_path}/integration
@@ -170,16 +198,19 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
 %license LICENSE
 %doc CHANGELOG.md README.md
 %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%dir %{gopath}/src/%{import_path}
 %endif
 
 %if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
+%files unit-test -f unit-test-devel.file-list
 %license LICENSE
 %doc CHANGELOG.md README.md
 %endif
 
 %changelog
+* Mon Jan 09 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.1.0-10
+- Bump to upstream 7f8ab55aaf3b86885aa55b762e803744d1674700
+  related: #1214619
+
 * Tue Aug 09 2016 jchaloup <jchaloup@redhat.com> - 1.1.0-9
 - Polish spec file, enable devel and unit-test for epel7
   related: #1214619
diff --git a/sources b/sources
index 3bc24ec..af015be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab8fe300cb5531fcc1d5faab1fea0f0d  ginkgo-462326b.tar.gz
+SHA512 (ginkgo-7f8ab55.tar.gz) = 4d9209f8b309005b12f3b830fb1e7b9527ebb39d81c8b24ea5b25aa98752b3a621172c77272af8b3a7a5a12fb2f2321f68b3c1c5209f0668006ffd1f516ac0b7