diff --git a/docker.spec b/docker.spec index 10d9e46..3ab472f 100644 --- a/docker.spec +++ b/docker.spec @@ -95,7 +95,7 @@ Name: %{repo} %endif Epoch: 2 Version: 1.11.2 -Release: 2.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -124,6 +124,8 @@ Source15: v1.10-migrator-helper #Patch0: build-with-debug-info.patch %endif +Patch0: s390x-pthread.patch + BuildRequires: git BuildRequires: glibc-static BuildRequires: go-md2man @@ -503,6 +505,10 @@ tar zxf %{SOURCE12} # untar docker-containerd tar zxf %{SOURCE13} +%ifarch s390x +%patch0 -p1 -b .ln +%endif + %build # set up temporary build gopath, and put our directory there mkdir _build @@ -851,6 +857,12 @@ exit 0 %{_datadir}/rhel/secrets/rhsm %changelog +* Thu Jun 09 2016 Antonio Murdaca - 2:1.11.2-4.git40ea190 +- rebuilt + +* Thu Jun 09 2016 Sinny Kumari - 2:1.11.2-3.git40ea190 +- BZ#1326896 - Fix build issue on s390x architecture + * Mon Jun 06 2016 Antonio Murdaca - 2:1.11.2-2.git40ea190 - Resolves: #1327809 - Resolves: #1330442 diff --git a/s390x-pthread.patch b/s390x-pthread.patch new file mode 100644 index 0000000..b169a0d --- /dev/null +++ b/s390x-pthread.patch @@ -0,0 +1,11 @@ +diff -upr docker-40ea190c1f5c5dd6ef9c3646ff06780ee2f8f1fd/hack/make/binary docker-40ea190c1f5c5dd6ef9c3646ff06780ee2f8f1fd.p/hack/make/binary +--- docker-40ea190c1f5c5dd6ef9c3646ff06780ee2f8f1fd/hack/make/binary 2016-06-03 05:12:34.000000000 -0400 ++++ docker-40ea190c1f5c5dd6ef9c3646ff06780ee2f8f1fd.p/hack/make/binary 2016-06-09 05:53:47.214067838 -0400 +@@ -51,6 +51,7 @@ echo "Building: $DEST/$BINARY_FULLNAME" + go build \ + -o "$DEST/$BINARY_FULLNAME" \ + "${BUILDFLAGS[@]}" \ ++ -gccgoflags="-lpthread"\ + -ldflags " + $LDFLAGS + $LDFLAGS_STATIC_DOCKER