From 2e75a051ea3501ff4bd9daa35cba428033af55a3dee26ae33fe29296f3cecd02 Mon Sep 17 00:00:00 2001 From: Containers Team Date: Tue, 21 Mar 2017 09:17:22 +0000 Subject: [PATCH 1/4] 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 --- master.tar.gz | 3 +++ umoci.changes | 7 +++++++ umoci.spec | 16 ++++++++-------- 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 master.tar.gz diff --git a/master.tar.gz b/master.tar.gz new file mode 100644 index 0000000..00b071a --- /dev/null +++ b/master.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c905af3bb1ed9e932de1a9f53d9010d4053bd442e5a2a23075e2a3333beac4c +size 232518 diff --git a/umoci.changes b/umoci.changes index c8214c9..36bf376 100644 --- a/umoci.changes +++ b/umoci.changes @@ -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 diff --git a/umoci.spec b/umoci.spec index 8bb8a72..f4ec0a0 100644 --- a/umoci.spec +++ b/umoci.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # # nodebuginfo + # Handle all Go arches. %{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le} @@ -26,13 +27,13 @@ %define project github.com/openSUSE/umoci Name: umoci -Version: 0.1.0 +Version: 0.1.0+20170321.07030c2 Release: 0 Summary: Open Container Image manipulation tool License: Apache-2.0 Group: System/Management Url: https://github.com/openSUSE/umoci -Source: %{name}-%{version}.tar.xz +Source: master.tar.gz %ifarch %{go_arches} BuildRequires: go >= 1.6 BuildRequires: go-go-md2man @@ -40,7 +41,7 @@ BuildRequires: go-go-md2man BuildRequires: gcc6-go >= 6.1 %endif BuildRequires: fdupes -BuildRoot: %{_tmppath}/%{name}-%{raw_version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?is_opensuse} ExcludeArch: s390x %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. %prep -%setup -q +%setup -q -n umoci-master %build @@ -65,7 +66,7 @@ cp -avr * $HOME/go/src/%{project} export VERSION="$(cat ./VERSION)" if [ "$VERSION" != "%{version}" ]; then - VERSION="%{version}_suse" + VERSION="%{version}_suse" fi # Build the binary. @@ -83,7 +84,7 @@ 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)" + install -D -m 0644 $file "%{buildroot}/%{_mandir}/man1/$(basename $file)" done %endif @@ -102,4 +103,3 @@ hack/test-unit.sh %endif %changelog - From 5a43d0e7d763b078b0f8e410f1af5bd60b22c57e6377cbf63eff18de4ae38b5c Mon Sep 17 00:00:00 2001 From: Maximilian Meister Date: Tue, 21 Mar 2017 09:34:46 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/umoci?expand=0&rev=11 --- umoci-0.1.0.tar.xz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 umoci-0.1.0.tar.xz diff --git a/umoci-0.1.0.tar.xz b/umoci-0.1.0.tar.xz deleted file mode 100644 index a2e5dbf..0000000 --- a/umoci-0.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b5af0838400bda64fa0f6516c7dfd9eb3d7e07f895c98ab79b458da6882c926 -size 161056 From 24a06e18f69a02af9b70d69fa30913c72c70eb0a10a5cd4532e2aa4890f672e4 Mon Sep 17 00:00:00 2001 From: Containers Team Date: Tue, 21 Mar 2017 10:45:05 +0000 Subject: [PATCH 3/4] new commit from concourse: merge branch 'pr-102' - packaging: move to contrib/pkg OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/umoci?expand=0&rev=12 --- master.tar.gz | 4 ++-- umoci.changes | 7 +++++++ umoci.spec | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/master.tar.gz b/master.tar.gz index 00b071a..0ebab88 100644 --- a/master.tar.gz +++ b/master.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c905af3bb1ed9e932de1a9f53d9010d4053bd442e5a2a23075e2a3333beac4c -size 232518 +oid sha256:48e049df1f3da55552ef460ef9a7108958d2f5c3008195093d4b9e0a14226085 +size 232511 diff --git a/umoci.changes b/umoci.changes index 36bf376..25b22cf 100644 --- a/umoci.changes +++ b/umoci.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 21 10:43:53 UTC 2017 - containers-bugowner@suse.de + +- merge branch 'pr-102' +- packaging: move to contrib/pkg + + ------------------------------------------------------------------- Tue Mar 21 09:16:12 UTC 2017 - containers-bugowner@suse.de diff --git a/umoci.spec b/umoci.spec index f4ec0a0..9b3c14d 100644 --- a/umoci.spec +++ b/umoci.spec @@ -27,7 +27,7 @@ %define project github.com/openSUSE/umoci Name: umoci -Version: 0.1.0+20170321.07030c2 +Version: +20170321.26b73ab Release: 0 Summary: Open Container Image manipulation tool License: Apache-2.0 From fad7441a871cf3ef04952d1990096a226f571964ece5454992a1a24f6523c1db Mon Sep 17 00:00:00 2001 From: Containers Team Date: Tue, 21 Mar 2017 20:50:30 +0000 Subject: [PATCH 4/4] new commit from concourse: merge branch 'pr-103' - makefile: switch go-build to use full project name - contrib: pkg: fix make_spec version OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/umoci?expand=0&rev=13 --- master.tar.gz | 4 ++-- umoci.changes | 8 ++++++++ umoci.spec | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/master.tar.gz b/master.tar.gz index 0ebab88..f885a33 100644 --- a/master.tar.gz +++ b/master.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48e049df1f3da55552ef460ef9a7108958d2f5c3008195093d4b9e0a14226085 -size 232511 +oid sha256:e2f39727cc86d665b7f9491e69dfb9e3422a3ed50dee8321afccbfd2ea3f2939 +size 232575 diff --git a/umoci.changes b/umoci.changes index 25b22cf..8f8b279 100644 --- a/umoci.changes +++ b/umoci.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 21 20:49:19 UTC 2017 - containers-bugowner@suse.de + +- merge branch 'pr-103' +- makefile: switch go-build to use full project name +- contrib: pkg: fix make_spec version + + ------------------------------------------------------------------- Tue Mar 21 10:43:53 UTC 2017 - containers-bugowner@suse.de diff --git a/umoci.spec b/umoci.spec index 9b3c14d..6baa8b7 100644 --- a/umoci.spec +++ b/umoci.spec @@ -27,7 +27,7 @@ %define project github.com/openSUSE/umoci Name: umoci -Version: +20170321.26b73ab +Version: 0.1.0+20170321.ef7aa39 Release: 0 Summary: Open Container Image manipulation tool License: Apache-2.0