public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-sccache] rawhide: Update to version 0.16.0
@ 2026-06-19 13:42 Andreas Schneider
0 siblings, 0 replies; only message in thread
From: Andreas Schneider @ 2026-06-19 13:42 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rust-sccache
Branch : rawhide
Commit : 04e0f9fe7a65a692eee0f8d00cfa404d1ac0fc08
Author : Andreas Schneider <asn@redhat.com>
Date : 2026-06-19T15:42:21+02:00
Stats : +10/-139 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/rust-sccache/c/04e0f9fe7a65a692eee0f8d00cfa404d1ac0fc08?branch=rawhide
Log:
Update to version 0.16.0
---
diff --git a/rust-sccache.spec b/rust-sccache.spec
index f664e86..fdb801d 100644
--- a/rust-sccache.spec
+++ b/rust-sccache.spec
@@ -7,7 +7,7 @@
%global crate sccache
Name: rust-sccache
-Version: 0.15.0
+Version: 0.16.0
Release: %autorelease
Summary: Sccache is a ccache-like tool
@@ -24,15 +24,9 @@ Patch: sccache-fix-metadata-auto.diff
# * Allow serde_json version 1.0.149
# * Allow tokio-serde version < 1.0
Patch: sccache-fix-metadata.diff
-# * Fix test_config_level_not_configured -
-# https://github.com/mozilla/sccache/pull/2695
-Patch10: sccache-better-multilevel-error.patch
BuildRequires: cargo-rpm-macros >= 26
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch: %{ix86}
-
%global _description %{expand:
Sccache is a ccache-like tool. It is used as a compiler wrapper and
avoids compilation when possible. Sccache has the capability to utilize
@@ -43,51 +37,8 @@ options, or alternatively, in local storage.}
%package -n %{crate}
Summary: %{summary}
-# (Apache-2.0 OR MIT) AND BSD-3-Clause
-# (MIT OR Apache-2.0) AND Unicode-DFS-2016
-# 0BSD OR MIT OR Apache-2.0
-# Apache-2.0
-# Apache-2.0 AND (Apache-2.0 OR MIT)
-# Apache-2.0 AND ISC AND (MIT OR Apache-2.0)
-# Apache-2.0 OR Apache-2.0 WITH LLVM-exception
-# Apache-2.0 OR BSL-1.0
-# Apache-2.0 OR ISC OR MIT
-# Apache-2.0 OR MIT
-# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-# BSD-2-Clause
-# BSD-2-Clause OR Apache-2.0 OR MIT
-# BSD-3-Clause
-# CDLA-Permissive-2.0
-# ISC
-# MIT
-# MIT OR Apache-2.0
-# MIT OR Zlib OR Apache-2.0
-# MIT-0 OR Apache-2.0
-# MPL-2.0
-# Unicode-3.0
-# Unlicense OR MIT
-# Zlib
-License: %{shrink:
- Apache-2.0 AND (Apache-2.0 OR MIT)
- AND BSD-2-Clause
- AND BSD-3-Clause
- AND CDLA-Permissive-2.0
- AND ISC
- AND MIT
- AND MPL-2.0
- AND Unicode-3.0
- AND Unicode-DFS-2016
- AND Zlib
- AND (0BSD OR MIT OR Apache-2.0)
- AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception)
- AND (Apache-2.0 OR BSL-1.0)
- AND (Apache-2.0 OR ISC OR MIT)
- AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT)
- AND (BSD-2-Clause OR Apache-2.0 OR MIT)
- AND (MIT OR Zlib OR Apache-2.0)
- AND (MIT-0 OR Apache-2.0)
- AND (Unlicense OR MIT)
-}
+# FIXME: paste output of %%cargo_license_summary here
+License: # FIXME
# LICENSE.dependencies contains a full license breakdown
%description -n %{crate} %{_description}
@@ -98,6 +49,7 @@ License: %{shrink:
%doc CLAUDE.md
%doc CODE_OF_CONDUCT.md
%doc README.md
+%doc RELEASE-0.16.0.md
%{_bindir}/sccache
%prep
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 036458b..285690a 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -9,11 +9,6 @@ cargo-toml-patch-comments = [
]
cargo-install-lib = false
-[[package.extra-patches]]
-number = 10
-file = "sccache-better-multilevel-error.patch"
-comments = [ "Fix test_config_level_not_configured - https://github.com/mozilla/sccache/pull/2695" ]
-
[scripts.prep]
post = [
"rm -f tests/oauth.rs",
diff --git a/sccache-better-multilevel-error.patch b/sccache-better-multilevel-error.patch
deleted file mode 100644
index 393548c..0000000
--- a/sccache-better-multilevel-error.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 62a046923b0dd000c0bbea88cecf17ea7a4a1077 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Tue, 5 May 2026 20:32:17 +0200
-Subject: [PATCH] fix: handle disabled cache backend features in multilevel
- chain
-
-When a backend feature (e.g. redis) is not compiled in but another
-remote backend feature is, the match arm for that backend was inactive
-and fell through to the wildcard, returning "Unknown cache level: 'X'"
-instead of a meaningful error.
----
- src/cache/multilevel.rs | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
-diff --git a/src/cache/multilevel.rs b/src/cache/multilevel.rs
-index f9296a4..9fe29a2 100644
---- a/src/cache/multilevel.rs
-+++ b/src/cache/multilevel.rs
-@@ -433,26 +433,54 @@ impl MultiLevelStorage {
- let cache_type = match level_name.to_lowercase().as_str() {
- #[cfg(feature = "s3")]
- "s3" => config.cache_configs.s3.clone().map(CacheType::S3),
-+ #[cfg(not(feature = "s3"))]
-+ "s3" => return Err(anyhow!("Cache level 's3' requires the 's3' feature")),
- #[cfg(feature = "redis")]
- "redis" => config.cache_configs.redis.clone().map(CacheType::Redis),
-+ #[cfg(not(feature = "redis"))]
-+ "redis" => {
-+ return Err(anyhow!("Cache level 'redis' requires the 'redis' feature"))
-+ }
- #[cfg(feature = "memcached")]
- "memcached" => config
- .cache_configs
- .memcached
- .clone()
- .map(CacheType::Memcached),
-+ #[cfg(not(feature = "memcached"))]
-+ "memcached" => {
-+ return Err(anyhow!(
-+ "Cache level 'memcached' requires the 'memcached' feature"
-+ ))
-+ }
- #[cfg(feature = "gcs")]
- "gcs" => config.cache_configs.gcs.clone().map(CacheType::GCS),
-+ #[cfg(not(feature = "gcs"))]
-+ "gcs" => return Err(anyhow!("Cache level 'gcs' requires the 'gcs' feature")),
- #[cfg(feature = "gha")]
- "gha" => config.cache_configs.gha.clone().map(CacheType::GHA),
-+ #[cfg(not(feature = "gha"))]
-+ "gha" => return Err(anyhow!("Cache level 'gha' requires the 'gha' feature")),
- #[cfg(feature = "azure")]
- "azure" => config.cache_configs.azure.clone().map(CacheType::Azure),
-+ #[cfg(not(feature = "azure"))]
-+ "azure" => {
-+ return Err(anyhow!("Cache level 'azure' requires the 'azure' feature"))
-+ }
- #[cfg(feature = "webdav")]
- "webdav" => config.cache_configs.webdav.clone().map(CacheType::Webdav),
-+ #[cfg(not(feature = "webdav"))]
-+ "webdav" => {
-+ return Err(anyhow!("Cache level 'webdav' requires the 'webdav' feature"))
-+ }
- #[cfg(feature = "oss")]
- "oss" => config.cache_configs.oss.clone().map(CacheType::OSS),
-+ #[cfg(not(feature = "oss"))]
-+ "oss" => return Err(anyhow!("Cache level 'oss' requires the 'oss' feature")),
- #[cfg(feature = "cos")]
- "cos" => config.cache_configs.cos.clone().map(CacheType::COS),
-+ #[cfg(not(feature = "cos"))]
-+ "cos" => return Err(anyhow!("Cache level 'cos' requires the 'cos' feature")),
- _ => {
- return Err(anyhow!("Unknown cache level: '{}'", level_name));
- }
---
-2.53.0
-
diff --git a/sccache-fix-metadata-auto.diff b/sccache-fix-metadata-auto.diff
index 40fdc35..ca992cb 100644
--- a/sccache-fix-metadata-auto.diff
+++ b/sccache-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
---- sccache-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ sccache-0.15.0/Cargo.toml 2026-05-05T18:53:55.386467+00:00
+--- sccache-0.16.0/Cargo.toml 2006-07-24T01:21:28+00:00
++++ sccache-0.16.0/Cargo.toml 2026-06-19T13:17:48.338983+00:00
@@ -476,17 +476,6 @@
[target."cfg(unix)".dependencies.daemonix]
version = "0.1"
diff --git a/sccache-fix-metadata.diff b/sccache-fix-metadata.diff
index dbac1f1..4d7c330 100644
--- a/sccache-fix-metadata.diff
+++ b/sccache-fix-metadata.diff
@@ -1,5 +1,5 @@
---- sccache-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ sccache-0.15.0/Cargo.toml 2026-05-05T18:53:55.388549+00:00
+--- sccache-0.16.0/Cargo.toml 2006-07-24T01:21:28+00:00
++++ sccache-0.16.0/Cargo.toml 2026-06-19T13:18:01.892769+00:00
@@ -27,7 +27,7 @@
"command-line-utilities",
"development-tools::build-utils",
@@ -84,7 +84,7 @@
[dependencies.serde_json]
-version = ">=1.0, <1.0.147"
-+version = ">=1.0, <1.0.150"
++version = ">=1.0, <1.0.151"
[dependencies.sha2]
version = "0.10.8"
diff --git a/sources b/sources
index 15b93a5..d69edbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sccache-0.15.0.crate) = a1125cdbc2614eaae745b1ca79da7d11d3fe26c65e15415c83f2b0198852560cc8b7eb0627812a9f577690ed78a5d2c7ce024074db398c9d84e89dcae328c66a
+SHA512 (sccache-0.16.0.crate) = f49220111f6188fbad0531bf639739113ef21731d822a589e06df9e43c3d9ddf3a3f86d0756cf5819a4a56dffc768693158c8804cb312916c7df93c94d3b09ff
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-19 13:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-19 13:42 [rpms/rust-sccache] rawhide: Update to version 0.16.0 Andreas Schneider
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox