import buildah-1.23.1-2.module+el8.5.0+13436+9c05b4ba

This commit is contained in:
CentOS Sources 2022-02-01 15:14:07 -05:00 committed by Stepan Oksanichenko
parent f8a80ebc59
commit bf13b06733
3 changed files with 19 additions and 9 deletions

View File

@ -1 +1 @@
f7aaa151b2f00ce3a1e437704765e23df61446d1 SOURCES/release-1.22-4d20222.tar.gz 28467d08c9f0f86602c67cb097e7ba39de8967fe SOURCES/release-1.23-867c1bc.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/release-1.22-4d20222.tar.gz SOURCES/release-1.23-867c1bc.tar.gz

View File

@ -11,12 +11,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
%endif %endif
%global import_path github.com/containers/buildah %global import_path github.com/containers/buildah
%global branch release-1.22 %global branch release-1.23
%global commit0 4d2022278696ad2f39b5c95029d8c699db404f37 %global commit0 867c1bc093ad54f4fd4ae7898a4c94066f9d8c91
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Epoch: 1
Name: buildah Name: buildah
Version: 1.22.3 Version: 1.23.1
Release: 2%{?dist} Release: 2%{?dist}
Summary: A command line tool used for creating OCI Images Summary: A command line tool used for creating OCI Images
License: ASL 2.0 License: ASL 2.0
@ -26,7 +27,7 @@ ExclusiveArch: %{go_arches}
%if 0%{?branch:1} %if 0%{?branch:1}
Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
%else %else
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%%{shortcommit0}.tar.gz Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
%endif %endif
BuildRequires: golang >= 1.16.6 BuildRequires: golang >= 1.16.6
BuildRequires: git BuildRequires: git
@ -55,7 +56,7 @@ or
%package tests %package tests
Summary: Tests for %{name} Summary: Tests for %{name}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: bzip2 Requires: bzip2
Requires: podman Requires: podman
Requires: golang Requires: golang
@ -73,7 +74,7 @@ This package contains system tests for %{name}
%if 0%{?branch:1} %if 0%{?branch:1}
%autosetup -Sgit -n containers-%{name}-%{shortcommit0} %autosetup -Sgit -n containers-%{name}-%{shortcommit0}
%else %else
%autosetup -Sgit -n %%{name}-%{commit0} %autosetup -Sgit -n %{name}-%{commit0}
%endif %endif
sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
sed -i '/docs install/d' Makefile sed -i '/docs install/d' Makefile
@ -115,7 +116,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
%license LICENSE %license LICENSE
%doc README.md %doc README.md
%{_bindir}/%{name} %{_bindir}/%{name}
%{_mandir}/man1/%{name}* %{_mandir}/man[15]/*
%dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions %dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/%{name} %{_datadir}/bash-completion/completions/%{name}
@ -127,6 +128,15 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%changelog %changelog
* Mon Nov 22 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.23.1-2
- update to the latest content of https://github.com/containers/buildah/tree/release-1.23
(https://github.com/containers/buildah/commit/867c1bc)
- Related: #2021990
* Wed Nov 10 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.23.1-1
- respect Epoch in subpackage dependencies
- Related: #2001445
* Wed Aug 25 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.3-2 * 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 - update to the latest content of https://github.com/containers/buildah/tree/release-1.22
(https://github.com/containers/buildah/commit/4d20222) (https://github.com/containers/buildah/commit/4d20222)