From da3caa6b6d89ea417fba13951cda28de781685fa3a2760406d4c0c98a84014ff Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Thu, 20 Apr 2017 10:25:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/umoci?expand=0&rev=21 --- umoci.changes | 6 ++++++ umoci.spec | 14 -------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/umoci.changes b/umoci.changes index d231979..f8c0758 100644 --- a/umoci.changes +++ b/umoci.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 12 09:46:18 UTC 2017 - jmassaguerpla@suse.com + +- remove the go_arches macro because we are using go1.7 which + is available in all archs + ------------------------------------------------------------------- Wed Apr 12 01:05:12 UTC 2017 - asarai@suse.com diff --git a/umoci.spec b/umoci.spec index 4551f42..0f15754 100644 --- a/umoci.spec +++ b/umoci.spec @@ -17,9 +17,6 @@ # nodebuginfo -# Handle all Go arches. -%{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le} - # Remove stripping of Go binaries. %define __arch_install_post export NO_BRP_STRIP_DEBUG=true @@ -36,13 +33,8 @@ Url: https://github.com/openSUSE/umoci Source0: %{name}-%{version}.tar.xz Source1: %{name}-%{version}.tar.xz.asc Source2: %{name}.keyring -%ifarch %{go_arches} BuildRequires: go >= 1.6 BuildRequires: go-go-md2man -%else -BuildRequires: gcc6-go >= 6.1 -%endif -BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?is_opensuse} ExcludeArch: s390x @@ -75,20 +67,16 @@ fi make VERSION="$VERSION" umoci # Build the docs if we have go-md2man. -%ifarch %{go_arches} make doc -%endif %install # Install the binary. install -D -m 0755 %{name} "%{buildroot}/%{_bindir}/%{name}" # Install all of the docs. -%ifarch %{go_arches} for file in man/*.1; do install -D -m 0644 $file "%{buildroot}/%{_mandir}/man1/$(basename $file)" done -%endif %fdupes %{buildroot}/%{_prefix} @@ -100,8 +88,6 @@ hack/test-unit.sh %defattr(-,root,root) %doc COPYING README.md man/*.md %{_bindir}/%{name} -%ifarch %{go_arches} %{_mandir}/man1/umoci* -%endif %changelog