diff --git a/anda/apps/sccache/sccache-fix-metadata-auto.diff b/anda/apps/sccache/sccache-fix-metadata-auto.diff deleted file mode 100644 index f5e1e6d2aa..0000000000 --- a/anda/apps/sccache/sccache-fix-metadata-auto.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- sccache-0.8.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sccache-0.8.1/Cargo.toml 2024-07-10T16:31:31.705674+00:00 -@@ -403,13 +403,3 @@ - [target."cfg(unix)".dependencies.daemonize] - version = "0.5" - --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = [ -- "fileapi", -- "handleapi", -- "stringapiset", -- "winnls", -- "processenv", -- "std", --] diff --git a/anda/apps/sccache/anda.hcl b/anda/tools/buildsys/sccache/anda.hcl similarity index 100% rename from anda/apps/sccache/anda.hcl rename to anda/tools/buildsys/sccache/anda.hcl diff --git a/anda/apps/sccache/rust-sccache.spec b/anda/tools/buildsys/sccache/rust-sccache.spec similarity index 98% rename from anda/apps/sccache/rust-sccache.spec rename to anda/tools/buildsys/sccache/rust-sccache.spec index a19dbcfd08..70be79da6a 100644 --- a/anda/apps/sccache/rust-sccache.spec +++ b/anda/tools/buildsys/sccache/rust-sccache.spec @@ -23,14 +23,13 @@ Source: %{crates_source} # Automatically generated patch to strip dependencies and normalize metadata Patch: sccache-fix-metadata-auto.diff -ExclusiveArch: %{rust_arches} - BuildRequires: cargo-rpm-macros >= 24 BuildRequires: anda-srpm-macros BuildRequires: openssl-devel BuildRequires: gcc BuildRequires: perl BuildRequires: rust-packaging +BuildRequires: mold %global _description %{expand: Sccache is a ccache-like tool. It is used as a compiler wrapper and @@ -48,6 +47,7 @@ License: MIT %files -n %{crate} %license LICENSE +#license LICENSE.dependencies %doc CODE_OF_CONDUCT.md %doc README.md %{_bindir}/sccache @@ -68,6 +68,9 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/CODE_OF_CONDUCT.md +%doc %{crate_instdir}/README.md %{crate_instdir}/ %package -n %{name}+default-devel @@ -471,6 +474,7 @@ use the "webdav" feature of the "%{crate}" crate. %endif %install +rm -rf .git || true %if %{with dist_server} %cargo_install -f dist-server %else diff --git a/anda/tools/buildsys/sccache/sccache-0.8.2.crate b/anda/tools/buildsys/sccache/sccache-0.8.2.crate new file mode 100644 index 0000000000..b794f80411 Binary files /dev/null and b/anda/tools/buildsys/sccache/sccache-0.8.2.crate differ diff --git a/anda/tools/buildsys/sccache/sccache-fix-metadata-auto.diff b/anda/tools/buildsys/sccache/sccache-fix-metadata-auto.diff new file mode 100644 index 0000000000..33ad098341 --- /dev/null +++ b/anda/tools/buildsys/sccache/sccache-fix-metadata-auto.diff @@ -0,0 +1,15 @@ +--- sccache-0.8.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sccache-0.8.2/Cargo.toml 2024-10-04T06:26:43.561316+00:00 +@@ -403,12 +403,3 @@ + [target."cfg(unix)".dependencies.daemonize] + version = "0.5" + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.52" +-features = [ +- "Win32_Foundation", +- "Win32_Globalization", +- "Win32_Storage_FileSystem", +- "Win32_System_Threading", +- "Win32_System_Console", +-] diff --git a/anda/apps/sccache/update.rhai b/anda/tools/buildsys/sccache/update.rhai similarity index 100% rename from anda/apps/sccache/update.rhai rename to anda/tools/buildsys/sccache/update.rhai