From 8d49fb0be265748945669ed97eeeff32f49b4496 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 29 2019 16:18:28 +0000 Subject: import buildah-1.9.0-1.el7 --- diff --git a/.buildah.metadata b/.buildah.metadata index db3a81a..524f7f1 100644 --- a/.buildah.metadata +++ b/.buildah.metadata @@ -1 +1 @@ -f09e61a813fc3b61d368dd5d183e8867e714dbb2 SOURCES/buildah-e23314b.tar.gz +d8c4ecf4ff637f6341209f8ae685caae51c77fc7 SOURCES/buildah-00eb895.tar.gz diff --git a/.gitignore b/.gitignore index de61df7..446fb64 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/buildah-e23314b.tar.gz +SOURCES/buildah-00eb895.tar.gz diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec index a0ed3ed..cf80021 100644 --- a/SPECS/buildah.spec +++ b/SPECS/buildah.spec @@ -18,25 +18,25 @@ %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; %endif -%global provider github -%global provider_tld com -%global project containers -%global repo buildah +%global provider github +%global provider_tld com +%global project containers +%global repo buildah # https://github.com/containers/buildah -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit e23314b1725544c4e4dd82afcfe2866e0fd2ddc5 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: %{repo} -Version: 1.8.2 -Release: 2.git%{shortcommit}%{?dist} -Summary: A command line tool used for creating OCI Images -License: ASL 2.0 -URL: https://%{provider_prefix} -Source: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 %{ix86} -%if 0%{?fedora} +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global git0 https://%{import_path} +%global commit 00eb895d6f2f13d658a9cb78714382e494974afc +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: %{repo} +Version: 1.9.0 +Release: 1%{?dist} +Summary: A command line tool used for creating OCI Images +License: ASL 2.0 +URL: https://%{name}.io +Source: %{git0}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 +%if 0%{?fedora} || 0%{?centos} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %else BuildRequires: go-toolset-1.10 @@ -51,12 +51,12 @@ BuildRequires: device-mapper-devel BuildRequires: btrfs-progs-devel BuildRequires: libassuan-devel BuildRequires: libseccomp-devel -Requires: runc >= 1.0.0-26 +Requires: runc >= 1.0.0-59 Requires: skopeo-containers >= 0.1.20-2 Requires: container-selinux %description -The buildah package provides a command line tool which can be used to +The %{name} package provides a command line tool which can be used to * create a working container from scratch or * create a working container from an image as a starting point @@ -100,6 +100,12 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Mon Jun 24 2019 Lokesh Mandvekar - 1.9.0-1 +- bump to v1.9.0 + +* Fri Jun 07 2019 Lokesh Mandvekar - 1.8.3-1 +- Resolves: #1717913 - rebase to v1.8.3 + * Tue May 14 2019 Lokesh Mandvekar - 1.8.2-2.gite23314b - built with %%gobuild - add seccomp and selinux buildtags