new commit from concourse: merge branch 'pr-101'

- packaging: add packaging helper to automate submissions to obs

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/umoci?expand=0&rev=10
This commit is contained in:
Containers Team 2017-03-21 09:17:22 +00:00 committed by Git OBS Bridge
parent 639c610c0a
commit 2e75a051ea
3 changed files with 18 additions and 8 deletions

3
master.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c905af3bb1ed9e932de1a9f53d9010d4053bd442e5a2a23075e2a3333beac4c
size 232518

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 21 09:16:12 UTC 2017 - containers-bugowner@suse.de
- merge branch 'pr-101'
- packaging: add packaging helper to automate submissions to obs
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 10 18:03:27 UTC 2017 - asarai@suse.com Fri Feb 10 18:03:27 UTC 2017 - asarai@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package umoci # spec file for package umoci
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,6 +16,7 @@
# #
# nodebuginfo # nodebuginfo
# Handle all Go arches. # Handle all Go arches.
%{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le} %{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le}
@ -26,13 +27,13 @@
%define project github.com/openSUSE/umoci %define project github.com/openSUSE/umoci
Name: umoci Name: umoci
Version: 0.1.0 Version: 0.1.0+20170321.07030c2
Release: 0 Release: 0
Summary: Open Container Image manipulation tool Summary: Open Container Image manipulation tool
License: Apache-2.0 License: Apache-2.0
Group: System/Management Group: System/Management
Url: https://github.com/openSUSE/umoci Url: https://github.com/openSUSE/umoci
Source: %{name}-%{version}.tar.xz Source: master.tar.gz
%ifarch %{go_arches} %ifarch %{go_arches}
BuildRequires: go >= 1.6 BuildRequires: go >= 1.6
BuildRequires: go-go-md2man BuildRequires: go-go-md2man
@ -40,7 +41,7 @@ BuildRequires: go-go-md2man
BuildRequires: gcc6-go >= 6.1 BuildRequires: gcc6-go >= 6.1
%endif %endif
BuildRequires: fdupes BuildRequires: fdupes
BuildRoot: %{_tmppath}/%{name}-%{raw_version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
ExcludeArch: s390x ExcludeArch: s390x
%endif %endif
@ -52,7 +53,7 @@ umoci is a manipulation tool for OCI images. In particular, it is an
alternative to oci-image-tools provided by the OCI. alternative to oci-image-tools provided by the OCI.
%prep %prep
%setup -q %setup -q -n umoci-master
%build %build
@ -65,7 +66,7 @@ cp -avr * $HOME/go/src/%{project}
export VERSION="$(cat ./VERSION)" export VERSION="$(cat ./VERSION)"
if [ "$VERSION" != "%{version}" ]; then if [ "$VERSION" != "%{version}" ]; then
VERSION="%{version}_suse" VERSION="%{version}_suse"
fi fi
# Build the binary. # Build the binary.
@ -83,7 +84,7 @@ install -D -m 0755 %{name} "%{buildroot}/%{_bindir}/%{name}"
# Install all of the docs. # Install all of the docs.
%ifarch %{go_arches} %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 %endif
@ -102,4 +103,3 @@ hack/test-unit.sh
%endif %endif
%changelog %changelog