This commit is contained in:
parent
c684f54353
commit
da3caa6b6d
@ -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
|
Wed Apr 12 01:05:12 UTC 2017 - asarai@suse.com
|
||||||
|
|
||||||
|
14
umoci.spec
14
umoci.spec
@ -17,9 +17,6 @@
|
|||||||
# nodebuginfo
|
# nodebuginfo
|
||||||
|
|
||||||
|
|
||||||
# Handle all Go arches.
|
|
||||||
%{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le}
|
|
||||||
|
|
||||||
# Remove stripping of Go binaries.
|
# Remove stripping of Go binaries.
|
||||||
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
|
%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
|
Source0: %{name}-%{version}.tar.xz
|
||||||
Source1: %{name}-%{version}.tar.xz.asc
|
Source1: %{name}-%{version}.tar.xz.asc
|
||||||
Source2: %{name}.keyring
|
Source2: %{name}.keyring
|
||||||
%ifarch %{go_arches}
|
|
||||||
BuildRequires: go >= 1.6
|
BuildRequires: go >= 1.6
|
||||||
BuildRequires: go-go-md2man
|
BuildRequires: go-go-md2man
|
||||||
%else
|
|
||||||
BuildRequires: gcc6-go >= 6.1
|
|
||||||
%endif
|
|
||||||
BuildRequires: fdupes
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%if 0%{?is_opensuse}
|
%if 0%{?is_opensuse}
|
||||||
ExcludeArch: s390x
|
ExcludeArch: s390x
|
||||||
@ -75,20 +67,16 @@ fi
|
|||||||
make VERSION="$VERSION" umoci
|
make VERSION="$VERSION" umoci
|
||||||
|
|
||||||
# Build the docs if we have go-md2man.
|
# Build the docs if we have go-md2man.
|
||||||
%ifarch %{go_arches}
|
|
||||||
make doc
|
make doc
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# Install the binary.
|
# Install the binary.
|
||||||
install -D -m 0755 %{name} "%{buildroot}/%{_bindir}/%{name}"
|
install -D -m 0755 %{name} "%{buildroot}/%{_bindir}/%{name}"
|
||||||
|
|
||||||
# Install all of the docs.
|
# Install all of the docs.
|
||||||
%ifarch %{go_arches}
|
|
||||||
for file in man/*.1; do
|
for file in man/*.1; do
|
||||||
install -D -m 0644 $file "%{buildroot}/%{_mandir}/man1/$(basename $file)"
|
install -D -m 0644 $file "%{buildroot}/%{_mandir}/man1/$(basename $file)"
|
||||||
done
|
done
|
||||||
%endif
|
|
||||||
|
|
||||||
%fdupes %{buildroot}/%{_prefix}
|
%fdupes %{buildroot}/%{_prefix}
|
||||||
|
|
||||||
@ -100,8 +88,6 @@ hack/test-unit.sh
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc COPYING README.md man/*.md
|
%doc COPYING README.md man/*.md
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%ifarch %{go_arches}
|
|
||||||
%{_mandir}/man1/umoci*
|
%{_mandir}/man1/umoci*
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user