diff --git a/.gitignore b/.gitignore index e943a49..127d7c2 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ /bootc-1.1.4-vendor.tar.zstd /bootc-1.1.5.tar.zstd /bootc-1.1.5-vendor.tar.zstd +/bootc-1.1.6-vendor.tar.zstd +/bootc-1.1.6.tar.zstd diff --git a/bootc.spec b/bootc.spec index ca20d1b..5ae5c59 100644 --- a/bootc.spec +++ b/bootc.spec @@ -12,8 +12,8 @@ %endif Name: bootc -Version: 1.1.5 -Release: 1%{?dist} +Version: 1.1.6 +Release: 2%{?dist} Summary: Bootable container system # Apache-2.0 @@ -65,12 +65,14 @@ Provides: ostree-cli(ostree-container) # (-n because we don't want the subpackage name to start with bootc-) %package -n system-reinstall-bootc Summary: Utility to reinstall the current system using bootc -Requires: podman +Recommends: podman # The reinstall subpackage intentionally does not require bootc, as it pulls in many unnecessary dependencies %description -n system-reinstall-bootc This package provides a utility to simplify reinstalling the current system to a given bootc image. +%global system_reinstall_bootc_install_podman_path %{_prefix}/lib/system-reinstall-bootc/install-podman + %prep %autosetup -p1 -a1 # Default -v vendor config doesn't support non-crates.io deps (i.e. git) @@ -89,7 +91,18 @@ rm vendor-config.toml # Build the system reinstallation CLI binary %global cargo_args -p system-reinstall-bootc -%cargo_build +export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_install_podman_path} +%if 0%{?fedora} || 0%{?rhel} >= 10 + # 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 + %cargo_build -- %cargo_args +%else + # Older macros from rust-toolset do *not* do flag processing, so + # '--' would be passed through to cargo directly, which is not + # what we want. + %cargo_build %cargo_args +%endif %cargo_vendor_manifest # https://pagure.io/fedora-rust/rust-packaging/issue/33 @@ -102,6 +115,12 @@ sed -i -e '/https:\/\//d' cargo-vendor.txt %if %{with ostree_ext} make install-ostree-hooks DESTDIR=%{?buildroot} %endif +mkdir -p %{buildroot}/%{dirname:%{system_reinstall_bootc_install_podman_path}} +cat >%{?buildroot}/%{system_reinstall_bootc_install_podman_path} < - 1.1.5-2 +- Sync specfile from upstream +- Resolves: #RHEL-80264 +- Resolves: #RHEL-81981 + * Mon Feb 10 2025 Joseph Marrero - 1.1.5-1 - Update to 1.1.5 - Resolves: #RHEL-77733 diff --git a/sources b/sources index 0afb796..96823fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootc-1.1.5.tar.zstd) = 7242933c354316a545e1c9ba6b7a00067d15d36480a49cdd1e6ce87ab9e6aa0b42f0358ea52a83a7d572a4ae2659f76d1acfe5333b9769e8752800159b513e53 -SHA512 (bootc-1.1.5-vendor.tar.zstd) = b8cc878e1931292645d68d2603aa59a5875a21682bed2048ccee414e3407cd63cbf40aac921f33381dc5930fd14793d7f3fc35c801c28dbad3dfd05f6c80dd38 +SHA512 (bootc-1.1.6-vendor.tar.zstd) = 9fcd7356a1c97e704dd0b0f1aa2bc6929da65fd59a38031cf398bd3a1f8e5bb73d6b410a07a52767d41055785fbeeb0c31688a939ae2f5278e5dbc68ee700aa2 +SHA512 (bootc-1.1.6.tar.zstd) = 977a26e4739ba623389c51efa7122ab14b2efd7ca15d210a0eb51918ec52492c70286396f7fc25ab0615038939c0c0890fad116126b0076748c7f40c9a912f41