From 6608361a223168a3b9fb60cae1f7d2133f5ac1ef Mon Sep 17 00:00:00 2001
From: gursewak1997 <gursmangat@gmail.com>
Date: Fri, 11 Jul 2025 12:08:39 -0700
Subject: [PATCH] Release 1.4.0

Resolves: #RHEL-102382
---
 .gitignore                          |  2 +
 0000-bootc-inistall-provision.patch | 65 -----------------------------
 bootc.spec                          |  5 +--
 sources                             |  4 +-
 4 files changed, 5 insertions(+), 71 deletions(-)
 delete mode 100644 0000-bootc-inistall-provision.patch

diff --git a/.gitignore b/.gitignore
index 6e51055..4824188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@
 /bootc-1.1.7-vendor.tar.zstd
 /bootc-1.3.0.tar.zstd
 /bootc-1.3.0-vendor.tar.zstd
+/bootc-1.4.0.tar.zstd
+/bootc-1.4.0-vendor.tar.zstd
diff --git a/0000-bootc-inistall-provision.patch b/0000-bootc-inistall-provision.patch
deleted file mode 100644
index e250bdf..0000000
--- a/0000-bootc-inistall-provision.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git i/tmt/tests/bootc-install-provision.sh w/tmt/tests/bootc-install-provision.sh
-index c4c884b..29df30c 100755
---- i/tmt/tests/bootc-install-provision.sh
-+++ w/tmt/tests/bootc-install-provision.sh
-@@ -4,6 +4,8 @@ set -exuo pipefail
- BOOTC_TEMPDIR=$(mktemp -d)
- trap 'rm -rf -- "$BOOTC_TEMPDIR"' EXIT
- 
-+ARCH=$(uname -m)
-+
- # LBI only enabled for test-22-logically-bound-install
- LBI="${LBI:-disabled}"
- 
-@@ -16,6 +18,28 @@ case "$ID" in
-     "fedora")
-         TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-quay.io/fedora/fedora-bootc:${VERSION_ID}}"
-         ;;
-+    "rhel")
-+        TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-images.paas.redhat.com/bootc/rhel-bootc:latest-${VERSION_ID}}"
-+
-+        CURRENT_COMPOSE_ID=$(skopeo inspect --no-tags --retry-times=5 --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.compose-id"')
-+
-+        if [[ -n ${CURRENT_COMPOSE_ID} ]]; then
-+            if [[ ${CURRENT_COMPOSE_ID} == *-updates-* ]]; then
-+                BATCH_COMPOSE="updates/"
-+            else
-+                BATCH_COMPOSE=""
-+            fi
-+        else
-+            BATCH_COMPOSE="updates/"
-+            CURRENT_COMPOSE_ID=latest-RHEL-$VERSION_ID
-+        fi
-+
-+        # use latest compose if specific compose is not accessible
-+        RC=$(curl -skIw '%{http_code}' -o /dev/null "http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/STATUS")
-+        if [[ $RC != "200" ]]; then
-+            CURRENT_COMPOSE_ID=latest-RHEL-${VERSION_ID%%}
-+        fi
-+        ;;
- esac
- 
- if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
-@@ -93,6 +117,22 @@ COMMONEOF
-         tee "$FEDORA_CI_CONTAINERFILE" > /dev/null << FEDORACIEOF
- FROM $TIER1_IMAGE_URL
- 
-+RUN <<REPORUN
-+tee "/etc/yum.repos.d/rhel.repo" >/dev/null <<RHELREPOEOF
-+[rhel-baseos]
-+name=baseos
-+baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/BaseOS/${ARCH}/os/
-+enabled=1
-+gpgcheck=0
-+
-+[rhel-appstream]
-+name=appstream
-+baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/AppStream/${ARCH}/os/
-+enabled=1
-+gpgcheck=0
-+RHELREPOEOF
-+REPORUN
-+
- RUN dnf -y upgrade /rpms/*.rpm
- FEDORACIEOF
-         cat >"$CONTAINERFILE" <<REALEOF
diff --git a/bootc.spec b/bootc.spec
index 304f95f..156e5c0 100644
--- a/bootc.spec
+++ b/bootc.spec
@@ -12,7 +12,7 @@
 %endif
 
 Name:           bootc
-Version:        1.3.0
+Version:        1.4.0
 Release:        %{autorelease}
 Summary:        Bootable container system
 
@@ -29,9 +29,6 @@ URL:            https://github.com/containers/bootc
 Source0:        %{url}/releases/download/v%{version}/bootc-%{version}.tar.zstd
 Source1:        %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar.zstd
 
-# Patch for integration test RHEL 9.x and 10.x support
-Patch0: 0000-bootc-inistall-provision.patch
-
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
diff --git a/sources b/sources
index f34da4f..8ffde51 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bootc-1.3.0.tar.zstd) = 9c31bf1ad26928df92ad836e4f9035425f22291e09537f6dbd81514db4d20d3f78de20273353b8253ade97dbbc7e0058d7ea7445edca42d3e052094e4a7472ae
-SHA512 (bootc-1.3.0-vendor.tar.zstd) = 60affd6342357376eaa1296ca2722d6f8897c0ce08fe2256cead1c3de57f2ceaf2c39bc5a968b85e983ba956db8d5e22244a54078f91b187d6bdff922437c9f1
+SHA512 (bootc-1.4.0.tar.zstd) = fe31cbdd08560bad3e333cee73b56eff2c2ea81a846932cbaa2f607d95d2f3b5104ece9232d64290672909aa6aac8754c0e61a993e91db42e7b128635da62c9a
+SHA512 (bootc-1.4.0-vendor.tar.zstd) = cf462ef87fcc16bdd9d32d5b561504ab7ff233e0a9a3b683b50d47494ef19c78948870e274f6571092ce770d9e8c7c470100e9a4dc961645e67790a868ba1d5c