diff --git a/buildah.spec b/buildah.spec index 97ed025..df0088d 100644 --- a/buildah.spec +++ b/buildah.spec @@ -15,13 +15,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global import_path github.com/containers/buildah #%%global branch main -%global commit0 ce608bcecdeb077daab846c83b026c508cff9688 +%global commit0 cdcaaf51b37d14cd160c046a8eaf02201699eb74 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: buildah -Version: 1.24.2 -Release: 2%{?dist} +Version: 1.25.0 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -32,7 +32,6 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif -Patch0: fix-bash-syntax.patch BuildRequires: golang >= 1.16.6 BuildRequires: git BuildRequires: glib2-devel @@ -132,6 +131,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog +* Wed Mar 30 2022 Jindrich Novy - 1:1.25.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.25.0 +- Related: #2061316 + * Mon Feb 21 2022 Lokesh Mandvekar - 1:1.24.2-2 - Add patch to fix bash symtax for gating tests - Upstream PR: https://github.com/containers/buildah/pull/3792 diff --git a/fix-bash-syntax.patch b/fix-bash-syntax.patch deleted file mode 100644 index e508848..0000000 --- a/fix-bash-syntax.patch +++ /dev/null @@ -1,45 +0,0 @@ -From eedab4fd872c3be8ab15af767897f92c78a71fde Mon Sep 17 00:00:00 2001 -From: Lokesh Mandvekar -Date: Mon, 21 Feb 2022 14:58:40 -0500 -Subject: [PATCH] helpers.bash: Use correct syntax - -Fixes gating test failure: -``` - /usr/share/buildah/test/system/./helpers.bash: line 474: !is_cgroupsv2: command not found - ``` - -Co-authored-by: Yiqiao Pu - -I'm just the committer. - -Signed-off-by: Lokesh Mandvekar ---- - tests/helpers.bash | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/helpers.bash b/tests/helpers.bash -index bd2794c974..3e72108bec 100644 ---- a/tests/helpers.bash -+++ b/tests/helpers.bash -@@ -433,9 +433,9 @@ function skip_if_rootless() { - ################################## - function skip_if_rootless_and_cgroupv1() { - if test "$BUILDAH_ISOLATION" = "rootless"; then -- if !is_cgroupsv2; then -- skip "${1:-test does not work when \$BUILDAH_ISOLATION = rootless} and not cgroupv2" -- fi -+ if ! is_cgroupsv2; then -+ skip "${1:-test does not work when \$BUILDAH_ISOLATION = rootless} and not cgroupv2" -+ fi - fi - } - -@@ -471,7 +471,7 @@ function skip_if_cgroupsv2() { - # skip_if_cgroupsv1 # Some tests don't work with cgroupsv1 - ####################### - function skip_if_cgroupsv1() { -- if !is_cgroupsv2; then -+ if ! is_cgroupsv2; then - skip "${1:-test does not work with cgroups v1}" - fi - } diff --git a/sources b/sources index ef69b83..81d5613 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-1.24.2-ce608bc.tar.gz) = 68c1f398653b90c54c1e8064c16495bc1908ed9cdf80e4c4aa3d76de3c87cdc247c68b4c0cea6b165370711d72d66ec21dca31329ce3ca43763a44f3379d64c7 +SHA512 (buildah-1.25.0-cdcaaf5.tar.gz) = 05ea46beb2f11195dd3a7b8abad6ddb03d6cf61ea33a2557f75e35d248a4790aa31dff1abb751bbbb9c5eeecadf082607dad5c2ea7b534d49b7b757934b1c6d1