From 13826db5a36671b5cab6f8ff4b53cb206bd5f8b2 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 31 Oct 2025 12:44:42 -0700 Subject: [PATCH] fix: zoi (#6995) (#6999) --- anda/langs/rust/zoi/rust-zoi-rs.spec | 15 +++++++++++---- anda/langs/rust/zoi/zoi-rs-fix-metadata-auto.diff | 7 ++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/anda/langs/rust/zoi/rust-zoi-rs.spec b/anda/langs/rust/zoi/rust-zoi-rs.spec index 5ab66124d7..973fb0373a 100644 --- a/anda/langs/rust/zoi/rust-zoi-rs.spec +++ b/anda/langs/rust/zoi/rust-zoi-rs.spec @@ -14,25 +14,27 @@ Source: %{crates_source %{crate} %{crate_version}} # Automatically generated patch to strip dependencies and normalize metadata Patch: zoi-rs-fix-metadata-auto.diff BuildRequires: cargo +BuildRequires: gcc-c++ BuildRequires: rpm_macro(cargo_install) BuildRequires: pkgconfig(openssl) BuildRequires: perl(FindBin) BuildRequires: perl(IPC::Cmd) BuildRequires: perl(File::Compare) BuildRequires: perl(File::Copy) +BuildRequires: perl(lib) +BuildRequires: perl(Time::Piece) Packager: madonuko %global _description %{expand: -Zoi is a universal package manager and environment setup tool, designed to simplify package management and environment configuration across multiple operating systems.} +Universal Package Manager & Environment Setup Tool.} -%description %_description +%description %{_description} %package -n %{crate} Summary: %{summary} License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 AND ISC) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CDLA-Permissive-2.0 AND ISC AND LGPL-2.0-or-later AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR LGPL-2.1-or-later) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND MPL-2.0+ AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib # LICENSE.dependencies contains a full license breakdown Provides: zoi = %evr -Provides: zoi.prod.beta = %evr Requires: git %description -n %{crate} %{_description} @@ -40,8 +42,11 @@ Requires: git %files -n %{crate} %license LICENSE %license LICENSE.dependencies +%doc CHANGELOG.md %doc CODE_OF_CONDUCT.md +%doc PACKAGING.md %doc README.md +%doc RELEASE.md %doc SECURITY.md %{_bindir}/zoi @@ -58,8 +63,11 @@ use the "%{crate}" crate. %files devel %license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/CHANGELOG.md %doc %{crate_instdir}/CODE_OF_CONDUCT.md +%doc %{crate_instdir}/PACKAGING.md %doc %{crate_instdir}/README.md +%doc %{crate_instdir}/RELEASE.md %doc %{crate_instdir}/SECURITY.md %{crate_instdir}/ @@ -75,7 +83,6 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml - %prep %autosetup -n %{crate}-%{crate_version} %cargo_prep_online diff --git a/anda/langs/rust/zoi/zoi-rs-fix-metadata-auto.diff b/anda/langs/rust/zoi/zoi-rs-fix-metadata-auto.diff index 54fe0a3877..1d59e54d5b 100644 --- a/anda/langs/rust/zoi/zoi-rs-fix-metadata-auto.diff +++ b/anda/langs/rust/zoi/zoi-rs-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- zoi-rs-4.3.7-beta/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zoi-rs-4.3.7-beta/Cargo.toml 2025-09-01T17:17:19.316000+00:00 -@@ -200,8 +200,6 @@ +--- zoi-rs-1.3.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zoi-rs-1.3.1/Cargo.toml 2025-10-31T16:56:25.441725+00:00 +@@ -223,9 +223,7 @@ [build-dependencies.dotenvy] version = "0.15.7" @@ -9,4 +9,5 @@ - [lints.clippy] too_many_arguments = "allow" + type_complexity = "allow" +