diff --git a/.gitignore b/.gitignore index fcfbd58..71aad2c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /bootc-1.1.0-vendor.tar.zstd /bootc-1.1.2.tar.zstd /bootc-1.1.2-vendor.tar.zstd +/bootc-1.1.4.tar.zstd +/bootc-1.1.4-vendor.tar.zstd diff --git a/bootc.spec b/bootc.spec index 6ed0e17..430c3dd 100644 --- a/bootc.spec +++ b/bootc.spec @@ -1,7 +1,18 @@ %bcond_without check +%if 0%{?rhel} >= 10 || 0%{?fedora} > 41 + %bcond_without ostree_ext +%else + %bcond_with ostree_ext +%endif + +%if 0%{?rhel} + %bcond_without rhsm +%else + %bcond_with rhsm +%endif Name: bootc -Version: 1.1.2 +Version: 1.1.4 Release: 1%{?dist} Summary: Bootable container system @@ -25,42 +36,52 @@ BuildRequires: libzstd-devel BuildRequires: make BuildRequires: ostree-devel BuildRequires: openssl-devel -BuildRequires: libzstd-devel %if 0%{?rhel} BuildRequires: rust-toolset %else BuildRequires: cargo-rpm-macros >= 25 %endif BuildRequires: systemd +# For tests +BuildRequires: skopeo ostree # Backing storage tooling https://github.com/containers/composefs/issues/125 -Recommends: composefs +Requires: composefs # For OS updates +Requires: ostree Requires: skopeo +Requires: podman # For bootloader updates Recommends: bootupd +# A made up provides so that rpm-ostree can depend on it +%if %{with ostree_ext} +Provides: ostree-cli(ostree-container) +%endif + %description %{summary} %prep %autosetup -p1 -a1 -%if 0%{?rhel} -%cargo_prep -V 1 -%else %cargo_prep -v vendor -%endif %build -%cargo_build -%if !0%{?rhel} +%if 0%{?rhel} == 10 + %cargo_build %{?with_rhsm:-f rhsm} +%else + %cargo_build %{?with_rhsm:--features rhsm} +%endif + %cargo_vendor_manifest %cargo_license_summary %{cargo_license} > LICENSE.dependencies -%endif %install %make_install INSTALL="install -p -c" +%if %{with ostree_ext} +make install-ostree-hooks DESTDIR=%{?buildroot} +%endif %if %{with check} %check @@ -70,19 +91,25 @@ Recommends: bootupd %files %license LICENSE-MIT %license LICENSE-APACHE -%if !0%{?rhel} %license LICENSE.dependencies %license cargo-vendor.txt -%endif %doc README.md %{_bindir}/bootc %{_prefix}/lib/bootc/ %{_prefix}/lib/systemd/system-generators/* +%if %{with ostree_ext} +%{_prefix}/libexec/libostree/ext/* +%endif %{_unitdir}/* +%{_docdir}/bootc/* %{_mandir}/man*/bootc* %changelog +* Tue Jan 14 2025 Joseph Marrero - 1.1.4-1 +- Update to 1.1.4 + Resolves: #RHEL-72862 + * Thu Nov 07 2024 Joseph Marrero - 1.1.2-1 - Update to 1.1.2 Resolves: #RHEL-66258 diff --git a/sources b/sources index 708f097..a3576d4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootc-1.1.2.tar.zstd) = 56d96521d848fd2897f9288122e0104e7ee4e3e6b9307f627491ed810c634f5aee42b5b18630dba31b32eaa211dd4509afbc70832a69fd5094d2aceb41009c74 -SHA512 (bootc-1.1.2-vendor.tar.zstd) = a563dbbdcdd6cb36fd5c6a262447c34d16a2308efbdb8e2b8bfd7cb01032552b582c13a0ccdd8f3908ab60c3293da4f59ab1335ff40bbac7aa076ebad8e73270 +SHA512 (bootc-1.1.4.tar.zstd) = 9d349f0954eef26bfa0a4f97d48bb497b845b0ba00748dba07571d6149b6fe75bf6cfcada6851f3c3a3f7f8bc863fbac51386d3018812f5db762e1b8a5eb1035 +SHA512 (bootc-1.1.4-vendor.tar.zstd) = fd7a68ae2c1b9890865705afa81aed940a51d588a9c9d63439b5e639608d8f9d23294f7fa09ccfb27f43ff21c44db157865f36c5a60862736d9fcc1614c91862