diff --git a/bootc.spec b/bootc.spec index 337b2d4..033f122 100644 --- a/bootc.spec +++ b/bootc.spec @@ -22,7 +22,7 @@ %endif Name: bootc -Version: 1.12.1 +Version: 1.13.0 Release: %{autorelease} Summary: Bootable container system @@ -145,7 +145,8 @@ sed -i -e '/https:\/\//d' cargo-vendor.txt %endif %install -%make_install INSTALL="install -p -c" +# Pass CARGO_FEATURES explicitly to prevent auto-detection rebuild in install environment +%make_install INSTALL="install -p -c" CARGO_FEATURES="%{?with_rhsm:rhsm}" %if %{with ostree_ext} make install-ostree-hooks DESTDIR=%{?buildroot} %endif @@ -161,7 +162,10 @@ 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 +find %{?buildroot}/%{_docdir} ! -type d -printf '%{_docdir}/%%P\n' | sort > bootcdoclist.txt + +rm -f %{buildroot}/%{_datadir}/elvish/lib/bootc.elv +rm -f %{buildroot}/%{_datadir}/powershell/Modules/Bootc/Bootc.psm1 %if %{with check} %check @@ -189,6 +193,15 @@ fi %endif %{_unitdir}/* %{_mandir}/man*/*bootc* +%if 0%{?rhel} && 0%{?rhel} <= 9 +%{_datadir}/bash-completion/completions/bootc +%{_datadir}/zsh/site-functions/_bootc +%{_datadir}/fish/vendor_completions.d/bootc.fish +%else +%{bash_completions_dir}/bootc +%{zsh_completions_dir}/_bootc +%{fish_completions_dir}/bootc.fish +%endif %files -n system-reinstall-bootc %{_bindir}/system-reinstall-bootc diff --git a/sources b/sources index 037f7c2..c8c2433 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootc-1.12.1-vendor.tar.zstd) = 2e52f13b5b0813965e1419233a7af888453d3e982c1b6c7ea2b1e3bdbc4b6b0dab6db19c0e4f30cc38da4a48db8bf206fa034837275a3d4fe9372a2c763ceef6 -SHA512 (bootc-1.12.1.tar.zstd) = 5046bdbe4d2f8ffabd8bf05f85c2f97004ec1011a76f7ac04dd12fb0eadffc4c3588533be97db7540bde3533a60d3fdb0ba75f8798b37a9428ec9300c2a4a7bf +SHA512 (bootc-1.13.0-vendor.tar.zstd) = 32c7aa4f66f14a4147d1ce9894d776b3abf31fcfc64227ee32cb14953b52691cdc3d50a4ff8e3651b36a36330e023bdb835ddbaa3fd443227b3be4be292c99fe +SHA512 (bootc-1.13.0.tar.zstd) = 8e58cf1ca10b6e57901ca930016ad7cdabc4e357370ba63ee4e48f3b727563244f17e93e604050ef808358e41dbf3741250121f3022b311906764ae0717409a0