From aa51b9f767f42c6042176038f60e719b8ee6489a Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 14 Mar 2023 16:20:31 +0100
Subject: [PATCH] buildah-1.24.6-5.el8

- remove Containerfile man page
- Related: #2176055

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 .gitignore   | 3 +--
 buildah.spec | 9 +++++++--
 gating.yaml  | 7 -------
 sources      | 2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 gating.yaml

diff --git a/.gitignore b/.gitignore
index 7728d6d..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-SOURCES/release-1.24-1320eb7.tar.gz
-/release-1.24-1320eb7.tar.gz
+/*.tar.gz
diff --git a/buildah.spec b/buildah.spec
index faca2b1..9fdb342 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -12,13 +12,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 
 %global import_path github.com/containers/buildah
 %global branch release-1.24
-%global commit0 1320eb734df906d4cd447117bff9555671298062
+%global commit0 60e6bc0f7338b4b7a0ec044f75f8dd3ba0fa58fb
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Epoch: 1
 Name: buildah
 Version: 1.24.6
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -108,6 +108,7 @@ 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
+rm -f %{buildroot}%{_mandir}/man5/Containerfile*
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -128,6 +129,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Mar 14 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.24.6-5
+- remove Containerfile man page
+- Related: #2176055
+
 * Mon Oct 31 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.6-3
 - update to the latest content of https://github.com/containers/buildah/tree/release-1.24
   (https://github.com/containers/buildah/commit/1320eb7)
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index e49fcf1..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# recipients: jnovy, lsm5, santiago
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/sources b/sources
index f6345ed..16b27a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (release-1.24-1320eb7.tar.gz) = dcb8fa739608a2d84cc223aa9558e04e0e20e3a8815205701e7c24e3faa8fd178085579246f4c051812afae251011521324a5d91ebe3dc4bf0fa51047b60bbc6
+SHA512 (release-1.24-60e6bc0.tar.gz) = 71326f49a8908b40821fcd5a6651d3c4dbbb6e89fe33787ec5b9e320de68609dda4a3416cd31029c84ad55d474f9a0bfc34f20fddcf9abb8fa21df9b0b93567d