From 8cbc353d27e30cfce89128469a54eb8c9c8be25e Mon Sep 17 00:00:00 2001
From: Joseph Marrero Corchado <jmarrero@redhat.com>
Date: Thu, 30 Oct 2025 22:41:39 -0400
Subject: [PATCH] Release 1.10.0

Resolves: #RHEL-125142

Comment out the downstream tmt patches for now as they are failing to apply.
---
 .gitignore |  2 ++
 bootc.spec | 46 ++++++++++++++++++++++++++++++++++------------
 sources    |  4 ++--
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 42d81de..943ecf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@
 /bootc-1.7.1.tar.zstd
 /bootc-1.8.0-vendor.tar.zstd
 /bootc-1.8.0.tar.zstd
+/bootc-1.10.0.tar.zstd
+/bootc-1.10.0-vendor.tar.zstd
diff --git a/bootc.spec b/bootc.spec
index 937832e..ae415ca 100644
--- a/bootc.spec
+++ b/bootc.spec
@@ -1,5 +1,5 @@
 %bcond_without check
-%if 0%{?rhel} >= 10 || 0%{?fedora} > 41
+%if 0%{?rhel} >= 9 || 0%{?fedora} > 41
     %bcond_without ostree_ext
 %else
     %bcond_with ostree_ext
@@ -11,8 +11,17 @@
     %bcond_with rhsm
 %endif
 
+%global rust_minor %(rustc --version | cut -f2 -d" " | cut -f2 -d".")
+
+# https://github.com/bootc-dev/bootc/issues/1640
+%if 0%{?fedora} || 0%{?rhel} >= 10 || 0%{?rust_minor} >= 89
+    %global new_cargo_macros 1
+%else
+    %global new_cargo_macros 0
+%endif
+
 Name:           bootc
-Version:        1.8.0
+Version:        1.10.0
 Release:        %{autorelease}
 Summary:        Bootable container system
 
@@ -25,14 +34,14 @@ Summary:        Bootable container system
 # MIT OR Apache-2.0
 # Unlicense OR MIT
 License:        Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT)
-URL:            https://github.com/containers/bootc
+URL:            https://github.com/bootc-dev/bootc
 Source0:        %{url}/releases/download/v%{version}/bootc-%{version}.tar.zstd
 Source1:        %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar.zstd
 
 # Don't remove, downstream patch only
 # Patch for integration test RHEL 9.x and 10.x support
-Patch0: 0000-bootc-inistall-provision.patch
-Patch1: 0001-bootc-inistall-provision.patch
+#Patch0: 0000-bootc-inistall-provision.patch
+#Patch1: 0001-bootc-inistall-provision.patch
 
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
@@ -41,6 +50,7 @@ BuildRequires: libzstd-devel
 BuildRequires: make
 BuildRequires: ostree-devel
 BuildRequires: openssl-devel
+BuildRequires: go-md2man
 %if 0%{?rhel}
 BuildRequires: rust-toolset
 %else
@@ -52,10 +62,13 @@ BuildRequires: skopeo ostree
 
 # Backing storage tooling https://github.com/containers/composefs/issues/125
 Requires: composefs
-# For OS updates
+# Keep this list in sync with workspace.metadata.binary-dependencies until we sync
+# it automatically
 Requires: ostree
 Requires: skopeo
 Requires: podman
+Requires: util-linux-core
+Requires: /usr/bin/chcon
 # For bootloader updates
 Recommends: bootupd
 
@@ -88,7 +101,7 @@ rm vendor-config.toml
 
 %build
 # Build the main bootc binary
-%if 0%{?fedora} || 0%{?rhel} >= 10
+%if %new_cargo_macros
     %cargo_build %{?with_rhsm:-f rhsm}
 %else
     %cargo_build %{?with_rhsm:--features rhsm}
@@ -97,7 +110,7 @@ rm vendor-config.toml
 # Build the system reinstallation CLI binary
 %global cargo_args -p system-reinstall-bootc
 export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_install_podman_path}
-%if 0%{?fedora} || 0%{?rhel} >= 10
+%if %new_cargo_macros
     # In cargo-rpm-macros, the cargo_build macro does flag processing,
     # so we need to pass '--' to signify that cargo_args is not part
     # of the macro args
@@ -109,6 +122,8 @@ export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_insta
     %cargo_build %cargo_args
 %endif
 
+make manpages
+
 %cargo_vendor_manifest
 # https://pagure.io/fedora-rust/rust-packaging/issue/33
 sed -i -e '/https:\/\//d' cargo-vendor.txt
@@ -126,13 +141,21 @@ cat >%{?buildroot}/%{system_reinstall_bootc_install_podman_path} <<EOF
 exec dnf -y install podman
 EOF
 chmod +x %{?buildroot}/%{system_reinstall_bootc_install_podman_path}
+# generate doc file list excluding directories; workaround for
+# https://github.com/coreos/rpm-ostree/issues/5420
+touch %{?buildroot}/%{_docdir}/bootc/baseimage/base/sysroot/.keepdir
+find %{?buildroot}/%{_docdir} ! -type d -printf '%{_docdir}/%%P\n' > bootcdoclist.txt
 
 %if %{with check}
 %check
-%cargo_test
+if grep -qEe 'Seccomp:.*0$' /proc/self/status; then
+    %cargo_test
+else
+    echo "skipping unit tests due to https://github.com/rpm-software-management/mock/pull/1613#issuecomment-3421908652"
+fi
 %endif
 
-%files
+%files -f bootcdoclist.txt
 %license LICENSE-MIT
 %license LICENSE-APACHE
 %license LICENSE.dependencies
@@ -145,8 +168,7 @@ chmod +x %{?buildroot}/%{system_reinstall_bootc_install_podman_path}
 %{_prefix}/libexec/libostree/ext/*
 %endif
 %{_unitdir}/*
-%{_docdir}/bootc/*
-%{_mandir}/man*/bootc*
+%{_mandir}/man*/*bootc*
 
 %files -n system-reinstall-bootc
 %{_bindir}/system-reinstall-bootc
diff --git a/sources b/sources
index 2f3445d..ab97ea1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bootc-1.8.0-vendor.tar.zstd) = 87efa96f2fb266a5ed951e24ce2992c313c7f69dbfbb36dce3ccbb5f75362db2542510ca18c405aedc5e1fa8b8d9b05855398a25d9422b978a18c3065dce7930
-SHA512 (bootc-1.8.0.tar.zstd) = 8ca696abd901dbc934c64199ee817466c41ae18dc516310e3bfcb9e67b97e5380507da6a7f480ef335241afc53794721efc6ffec58cd3b36ed857006390b9ab8
+SHA512 (bootc-1.10.0.tar.zstd) = bf091786d6dd68ceb4741533a95261b3035c65d0d536d3fa5e6eee2b7ebda0b25efbf6aedf651b2cade8bdd93d39490bb2f3fab2f380a9422458e23e9b918051
+SHA512 (bootc-1.10.0-vendor.tar.zstd) = 7e291d34ef83b69d801828b99a9645d98f750c90c563774f601fd4bf84c9236e2f0964dfae2d4c46243f9b1d891d21cd8a8b5418e26a8282a1ca553bb5575aa3