diff --git a/.buildah.metadata b/.buildah.metadata
index 4a58d89..db3a81a 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-29202b2a8c6470411b9b197989bdc5f8abfef215 SOURCES/buildah-93747b1.tar.gz
+f09e61a813fc3b61d368dd5d183e8867e714dbb2 SOURCES/buildah-e23314b.tar.gz
diff --git a/.gitignore b/.gitignore
index 3f6e150..de61df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/buildah-93747b1.tar.gz
+SOURCES/buildah-e23314b.tar.gz
diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec
index 9cead7f..b9c0fb2 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -14,18 +14,22 @@
%global debug_package %{nil}
%endif
+%if ! 0%{?gobuild:1}
+%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
-# https://github.com/projectatomic/buildah
+# https://github.com/containers/buildah
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
-%global commit 93747b1fd5124fdc64344e569b79a8ec49d5f8ae
+%global commit e23314b1725544c4e4dd82afcfe2866e0fd2ddc5
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{repo}
-Version: 1.7.1
+Version: 1.8.2
Release: 2.git%{shortcommit}%{?dist}
Summary: A command line tool used for creating OCI Images
License: ASL 2.0
@@ -50,7 +54,6 @@ BuildRequires: libseccomp-devel
Requires: runc >= 1.0.0-26
Requires: skopeo-containers >= 0.1.20-2
Requires: container-selinux
-Provides: %{repo} = %{version}-%{release}
%description
The buildah package provides a command line tool which can be used to
@@ -76,8 +79,9 @@ popd
mv vendor src
export GOPATH=$(pwd)/_build:$(pwd)
-make all GIT_COMMIT=%{shortcommit}
-
+export BUILDTAGS='seccomp selinux'
+%gobuild -o %{name} %{import_path}/cmd/%{name}
+%{__make} docs
%install
export GOPATH=$(pwd)/_build:$(pwd)
@@ -96,8 +100,16 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
%{_datadir}/bash-completion/completions/%{name}
%changelog
-* Wed Mar 27 2019 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.7.1-2.git93747b1
-- rebase
+* Tue May 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.8.2-2.gite23314b
+- built with %%gobuild
+- add seccomp and selinux buildtags
+
+* Tue May 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.8.2-1.gite23314b
+- Resolves: #1706058 - bump to v1.8.2
+- fix indentation in a prior changelog entry
+
+* Fri May 03 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.8.1-1.git57b4288
+- Resolves: #1706058 - bump to v1.8.1
* Fri Feb 22 2019 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.7-2.git873f001
- rebase
@@ -439,33 +451,33 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
- built commit 6f7d05b
* Wed Apr 4 2018 Dan Walsh <dwalsh@redhat.com> 0.16-1
-- Add support for shell
-- Vendor in latest containers/image
-- docker-archive generates docker legacy compatible images
-- Do not create $DiffID subdirectories for layers with no configs
-- Ensure the layer IDs in legacy docker/tarfile metadata are unique
-- docker-archive: repeated layers are symlinked in the tar file
-- sysregistries: remove all trailing slashes
-- Improve docker/* error messages
-- Fix failure to make auth directory
-- Create a new slice in Schema1.UpdateLayerInfos
-- Drop unused storageImageDestination.{image,systemContext}
-- Load a *storage.Image only once in storageImageSource
-- Support gzip for docker-archive files
-- Remove .tar extension from blob and config file names
-- ostree, src: support copy of compressed layers
-- ostree: re-pull layer if it misses uncompressed_digest|uncompressed_size
-- image: fix docker schema v1 -> OCI conversion
-- Add /etc/containers/certs.d as default certs directory
-- Change image time to locale, add troubleshooting.md, add logo to other mds
-- Allow --cmd parameter to have commands as values
-- Document the mounts.conf file
-- Fix man pages to format correctly
-- buildah from now supports pulling images using the following transports:
-- docker-archive, oci-archive, and dir.
-- If the user overrides the storage driver, the options should be dropped
-- Show Config/Manifest as JSON string in inspect when format is not set
-- Adds feature to pull compressed docker-archive files
+- Add support for shell
+- Vendor in latest containers/image
+- docker-archive generates docker legacy compatible images
+- Do not create $DiffID subdirectories for layers with no configs
+- Ensure the layer IDs in legacy docker/tarfile metadata are unique
+- docker-archive: repeated layers are symlinked in the tar file
+- sysregistries: remove all trailing slashes
+- Improve docker/* error messages
+- Fix failure to make auth directory
+- Create a new slice in Schema1.UpdateLayerInfos
+- Drop unused storageImageDestination.{image,systemContext}
+- Load a *storage.Image only once in storageImageSource
+- Support gzip for docker-archive files
+- Remove .tar extension from blob and config file names
+- ostree, src: support copy of compressed layers
+- ostree: re-pull layer if it misses uncompressed_digest|uncompressed_size
+- image: fix docker schema v1 -> OCI conversion
+- Add /etc/containers/certs.d as default certs directory
+- Change image time to locale, add troubleshooting.md, add logo to other mds
+- Allow --cmd parameter to have commands as values
+- Document the mounts.conf file
+- Fix man pages to format correctly
+- buildah from now supports pulling images using the following transports:
+- docker-archive, oci-archive, and dir.
+- If the user overrides the storage driver, the options should be dropped
+- Show Config/Manifest as JSON string in inspect when format is not set
+- Adds feature to pull compressed docker-archive files
* Tue Feb 27 2018 Dan Walsh <dwalsh@redhat.com> 0.15-1
- Fix handling of buildah run command options