import buildah-1.22.3-2.module+el8.5.0+12381+e822eb26

This commit is contained in:
CentOS Sources 2021-10-06 00:43:57 -04:00 committed by Stepan Oksanichenko
parent e511d85501
commit 2a6396ae43
3 changed files with 253 additions and 12 deletions

View File

@ -1 +1 @@
537aa647186c29e7afe8724d086e621d42119c42 SOURCES/release-1.19-7aedb16.tar.gz
f7aaa151b2f00ce3a1e437704765e23df61446d1 SOURCES/release-1.22-4d20222.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/release-1.19-7aedb16.tar.gz
SOURCES/release-1.22-4d20222.tar.gz

View File

@ -1,5 +1,3 @@
%global with_bundled 1
%global _find_debuginfo_dwz_opts %{nil}
%global _dwz_low_mem_die_limit 0
@ -13,13 +11,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
%endif
%global import_path github.com/containers/buildah
%global branch release-1.19
%global commit0 7aedb164287ed9c64ab38be2b3490782adadb894
%global branch release-1.22
%global commit0 4d2022278696ad2f39b5c95029d8c699db404f37
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: buildah
Version: 1.19.6
Release: 1%{?dist}
Version: 1.22.3
Release: 2%{?dist}
Summary: A command line tool used for creating OCI Images
License: ASL 2.0
URL: https://%{name}.io
@ -28,9 +26,9 @@ ExclusiveArch: %{go_arches}
%if 0%{?branch:1}
Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
%else
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%%{shortcommit0}.tar.gz
%endif
BuildRequires: golang >= 1.12.12-4
BuildRequires: golang >= 1.16.6
BuildRequires: git
BuildRequires: glib2-devel
BuildRequires: libseccomp-devel
@ -42,7 +40,7 @@ BuildRequires: device-mapper-devel
BuildRequires: libassuan-devel
BuildRequires: make
Requires: runc >= 1.0.0-26
Requires: containers-common
Requires: containers-common >= 2:1-2
Recommends: container-selinux
Requires: slirp4netns >= 0.3-0
@ -61,7 +59,10 @@ Requires: %{name} = %{version}-%{release}
Requires: bzip2
Requires: podman
Requires: golang
Requires: jq
Requires: httpd-tools
Requires: openssl
Requires: nmap-ncat
%description tests
%{summary}
@ -72,7 +73,7 @@ This package contains system tests for %{name}
%if 0%{?branch:1}
%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
%else
%autosetup -Sgit -n %{name}-%{commit0}
%autosetup -Sgit -n %%{name}-%{commit0}
%endif
sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
sed -i '/docs install/d' Makefile
@ -90,9 +91,12 @@ export GOPATH=$(pwd)/_build:$(pwd)
export BUILDTAGS='seccomp selinux btrfs_noversion exclude_graphdriver_btrfs'
export GO111MODULE=off
export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
export LDFLAGS="$LDFLAGS -X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go
%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
%gobuild -o imgtype %{import_path}/tests/imgtype
%gobuild -o bin/copy %{import_path}/tests/copy
GOMD2MAN=go-md2man %{__make} -C docs
%install
@ -101,6 +105,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy
make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
#define license tag if not already defined
@ -118,9 +123,245 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
%files tests
%license LICENSE
%{_bindir}/%{name}-imgtype
%{_bindir}/%{name}-copy
%{_datadir}/%{name}/test
%changelog
* Wed Aug 25 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.3-2
- update to the latest content of https://github.com/containers/buildah/tree/release-1.22
(https://github.com/containers/buildah/commit/4d20222)
- Related: #1934415
* Fri Aug 20 2021 Lokesh Mandvekar <lsm5@redhat.com> - 1.22.3-1
- update to v1.22.3
- Related: #1934415
* Mon Aug 16 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-3
- update to the latest content of https://github.com/containers/buildah/tree/release-1.22
(https://github.com/containers/buildah/commit/98960f2)
- Related: #1934415
* Thu Aug 05 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-2
- update to the latest content of https://github.com/containers/buildah/tree/release-1.22
(https://github.com/containers/buildah/commit/71b8003)
- Related: #1934415
* Tue Aug 03 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-1
- update to 1.22.0 release and switch to the release-1.22 maint branch
- Related: #1934415
* Mon Aug 02 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.4
- update to the latest content of https://github.com/containers/buildah/tree/main
(https://github.com/containers/buildah/commit/56ff12f)
- Related: #1934415
* Thu Jul 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.3
- update to the latest content of https://github.com/containers/buildah/tree/main
(https://github.com/containers/buildah/commit/f517d85)
- Related: #1934415
* Wed Jul 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.2
- update to the latest content of https://github.com/containers/buildah/tree/main
(https://github.com/containers/buildah/commit/42dbc97)
- Related: #1934415
* Wed Jul 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.0-1
- update to the latest content of https://github.com/containers/buildah/tree/main
(https://github.com/containers/buildah/commit/42dbc97)
- Related: #1934415
* Tue Jul 27 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.1
- switch to main branch
- Related: #1934415
* Mon Jul 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.4-2
- add buildah-copy helper
- Related: #1934415
* Mon Jul 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.4-1
- update to the latest content of https://github.com/containers/buildah/tree/release-1.21
(https://github.com/containers/buildah/commit/9c83683)
- Related: #1934415
* Wed Jul 21 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.3-2
- update to the latest content of https://github.com/containers/buildah/tree/release-1.21
(https://github.com/containers/buildah/commit/30a10f3)
- Related: #1934415
* Thu Jul 15 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.3-1
- update to the latest content of https://github.com/containers/buildah/tree/release-1.21
(https://github.com/containers/buildah/commit/7f9540d)
- Related: #1934415
* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-0.17
- update to buildah 1.21.1 from the release-1.21 upstream branch
- Related: #1934415
* Tue Jun 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.16
- update to the latest content of https://github.com/containers/buildah/tree/main
(https://github.com/containers/buildah/commit/3ed5d8e)
- Related: #1934415
* Mon Jun 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.15
- update to the latest content of https://github.com/containers/buildah/tree/main
(https://github.com/containers/buildah/commit/c7d828f)
- Related: #1934415
* Fri Jun 25 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.14
- "buildah version" produces correct output
- Related: #1934415
* Fri Jun 25 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.13
- update to the latest content of https://github.com/containers/buildah/tree/main
(https://github.com/containers/buildah/commit/6bc611d)
- Related: #1934415
* Thu Jun 24 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.12
- update to the latest content of https://github.com/containers/buildah/tree/main
(https://github.com/containers/buildah/commit/3a0b52f)
- Related: #1934415
* Wed Jun 23 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.11
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/6d5d1ae)
- Related: #1934415
* Tue Jun 22 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.10
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/802a904)
- Related: #1934415
* Mon Jun 21 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.9
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/5181b9c)
- Related: #1934415
* Fri Jun 18 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.8
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/db16262)
- Related: #1934415
* Thu Jun 17 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.7
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/30c07b7)
- Related: #1934415
* Wed Jun 16 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.6
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/d99221f)
- Related: #1934415
* Mon Jun 14 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.5
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/8d08247)
- Related: #1934415
* Thu Jun 10 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.4
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/9c7f50b)
- Related: #1934415
* Mon Jun 07 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.3
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/d08dbe7)
- Related: #1934415
* Thu Jun 03 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.2
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/bbbe10a)
- Related: #1934415
* Wed Jun 02 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-0.8
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/4fa566e)
- Related: #1934415
* Mon May 31 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-0.7
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/8a6d840)
- Related: #1934415
* Wed May 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-0.6
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/d677bf0)
- Related: #1934415
* Tue May 25 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-0.5
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/df14b1c)
- Related: #1934415
* Fri May 21 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-0.4
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/19d3065)
- Related: #1934415
* Fri May 21 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-0.3
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/2a83637)
- Related: #1934415
* Thu May 20 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-0.2
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/f629ded)
- Related: #1934415
* Wed May 19 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.2-0.8
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/c3a3fe8)
- Related: #1934415
* Wed May 19 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.2-0.7
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/f30b420)
- Related: #1934415
* Mon May 17 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.2-0.6
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/162fbaf)
- Related: #1934415
* Thu May 13 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.2-0.5
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/5119393)
- Related: #1934415
* Wed May 12 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.2-0.4
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/a0853c3)
- Related: #1934415
* Tue May 11 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.2-0.3
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/135d63d)
- Related: #1934415
* Tue May 11 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.2-2
- fix release to reflect a development version
- Related: #1934415
* Fri May 07 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.2-1
- update to the latest content of https://github.com/containers/buildah/tree/master
(https://github.com/containers/buildah/commit/22fc573)
- Related: #1934415
* Mon Apr 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.1-1
- update to https://github.com/containers/buildah/releases/tag/v1.20.1
- sync tests with Fedora
- Related: #1934415
* Fri Mar 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.20.0-1
- update to https://github.com/containers/buildah/releases/tag/v1.20.0
- Related: #1934415
* Tue Mar 09 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.8-1
- update to https://github.com/containers/buildah/releases/tag/v1.19.8
- Related: #1934415
* Fri Mar 05 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.7-1
- update to https://github.com/containers/buildah/releases/tag/v1.19.7
- Related: #1934415
* Fri Feb 19 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.6-1
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/7aedb16)