no min version requirement on libseccomp for centos

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

.gitignore

@@ -274,3 +274,12 @@
 /buildah-96a136e.tar.gz
 /buildah-2df08f0.tar.gz
 /buildah-a99139c.tar.gz
+/buildah-2c5da1b.tar.gz
+/buildah-413bd1f.tar.gz
+/buildah-0bafbfe.tar.gz
+/buildah-bdd78ad.tar.gz
+/buildah-21b4778.tar.gz
+/buildah-9513cb8.tar.gz
+/buildah-6cc4656.tar.gz
+/v1.13.2.tar.gz
+/v1.14.0.tar.gz

buildah.spec

@@ -1,5 +1,10 @@
 %global with_bundled 1
+
+%if 0%{?fedora}
 %global with_debug 1
+%else
+%global with_debug 0
+%endif
 
 %if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
@@ -8,44 +13,55 @@
 %global debug_package   %{nil}
 %endif
 
-%global provider github
-%global provider_tld com
-%global project containers
-%global repo buildah
+%if ! 0%{?gobuild:1}
+%define gobuild(o:) GO111MODULE=off 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
+
+%define provider github
+%define provider_tld com
+%define project containers
+%define repo buildah
 # https://github.com/containers/buildah
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global git0 https://%{import_path}
-%global commit0 a99139c1965b4426177fc70ee53a8e8dfdf3b6f9
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%define import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%define git0 https://%{import_path}
+%define commit0 5965d9acffad0b70e8760de643b5f488ecadec24
+%define shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
+# Used for comparing with latest upstream tag
+# to decide whether to autobuild (non-rawhide only)
+%define built_tag v1.14.0
+%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
+%define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz
 
 Name: %{repo}
-Version: 1.11.0
-Release: 0.16.dev.git%{shortcommit0}%{?dist}
+Version: 1.14.0
+Release: 2%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
-Source: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+Source: %{download_url}
+BuildRequires: golang
 BuildRequires: git
 BuildRequires: glib2-devel
-BuildRequires: libseccomp-static
-BuildRequires: ostree-devel
 BuildRequires: glibc-static
-BuildRequires: golang-github-cpuguy83-md2man
+BuildRequires: go-md2man
 BuildRequires: gpgme-devel
-BuildRequires: device-mapper-devel
-BuildRequires: btrfs-progs-devel
 BuildRequires: libassuan-devel
 BuildRequires: make
-Requires: runc >= 1.0.0-17
 Requires: containers-common
 %if 0%{?fedora}
+Requires: crun >= 0.10-1
+BuildRequires: btrfs-progs-devel
+BuildRequires: device-mapper-devel
+BuildRequires: ostree-devel
+BuildRequires: libseccomp-static
 Recommends: container-selinux
 Recommends: slirp4netns >= 0.3-0
 Recommends: fuse-overlayfs
 %else
 #### DO NOT REMOVE - NEEDED FOR CENTOS
+BuildRequires: libseccomp-devel
+Requires: libseccomp
 Requires: container-selinux
 Requires: slirp4netns >= 0.3-0
 %endif
@@ -59,8 +75,23 @@ or
 * save container's root file system layer to create a new image
 * delete a working container or an image
 
+%package tests
+Summary: Tests for %{name}
+
+Requires: %{name} = %{version}-%{release}
+Requires: bats
+Requires: bzip2
+Requires: podman
+Requires: golang
+Requires: jq
+
+%description tests
+%{summary}
+
+This package contains system tests for %{name}
+
 %prep
-%autosetup -Sgit -n %{name}-%{commit0}
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
 sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
 sed -i '/docs install/d' Makefile
 
@@ -75,7 +106,12 @@ mv vendor src
 
 export GOPATH=$(pwd)/_build:$(pwd)
 export BUILDTAGS='seccomp selinux'
+%if 0%{?centos}
+export BUILDTAGS="exclude_graphdriver_btrfs exclude_graphdriver_devicemapper containers_image_ostree_stub"
+%endif
+export GO111MODULE=off
 %gobuild -o %{name} %{import_path}/cmd/%{name}
+%gobuild -o imgtype %{import_path}/tests/imgtype
 GOMD2MAN=go-md2man %{__make} -C docs
 
 %install
@@ -83,6 +119,10 @@ export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 
+install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
+cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
+cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
+
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
@@ -95,7 +135,136 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/%{name}
 
+%files tests
+%license LICENSE
+%{_bindir}/%{name}-imgtype
+%{_datadir}/%{name}/test
+
+
 %changelog
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Fri Feb 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.14.0-2
+- bump to v1.14.0
+- autobuilt 5965d9a
+
+* Thu Feb 06 2020 Eduardo Santiago <santiago@redhat.com> - 1.13.2-3
+- new -tests subpackage
+
+* Tue Feb 04 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.13.2-2
+- bump to v1.13.2
+- autobuilt b8a8a01
+
+* Fri Dec 13 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.12.0-2
+- bump to v1.12.0
+- autobuilt 6cc4656
+
+* Fri Dec 06 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.11.6-2
+- bump to v1.11.6
+- autobuilt 9513cb8
+
+* Wed Oct 30 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.11.4-3
+- crun only for fedora ATM
+
+* Mon Oct 28 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.11.4-2
+- bump to v1.11.4
+- autobuilt 21b4778
+
+* Wed Oct 16 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.11.3-3
+- update libseccomp dep for centos
+
+* Fri Oct 04 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.11.3-2
+- bump to v1.11.3
+- autobuilt bdd78ad
+
+* Tue Oct 01 2019 Debarshi Ray <rishi@fedoraproject.org> - 1.11.2-3.git0bafbfe
+- Switch to crun for Cgroups v2 support
+
+* Tue Sep 17 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 1.11.2-2.git0bafbfe
+- bump to v1.11.2
+- autobuilt 0bafbfe
+
+* Thu Sep 12 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 1.11.1-2.git413bd1f
+- bump to v1.11.1
+- autobuilt 413bd1f
+
+* Thu Sep 05 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.11.0-1.git2c5da1b
+- built tag v1.11.0
+
 * Mon Aug 12 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 1.11.0-0.16.dev.gita99139c
 - autobuilt a99139c
 

sources

@@ -1 +1 @@
-SHA512 (buildah-a99139c.tar.gz) = ab07eb7c0bbc95232005a9c5c7ad16c6f3c29e26483383b98c4fcfdcdb2b79507065b7182324d6285cb16473ace77ba46f4c6b91b7d48b70487e7bdbc0b46b66
+SHA512 (v1.14.0.tar.gz) = c2fe27ccff81cc22dcb398f6d57f618015a1f534510888966483002d552c5f233b8899f639dac15d0f299c6c618e6f1d9889e65c745ce4709e7abd9498258a86