public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-cap-primitives] f45: Unretire and update to version 4.0.2; Fixes RHBZ#2517207
@ 2026-08-25  9:22 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-08-25  9:22 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-cap-primitives
Branch : f45
Commit : 4e0d7d23e213cfeb4eb6a5302df27c31a727d4d6
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-08-25T09:36:43+01:00
Stats  : +52/-34 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-cap-primitives/c/4e0d7d23e213cfeb4eb6a5302df27c31a727d4d6?branch=f45

Log:
Unretire and update to version 4.0.2; Fixes RHBZ#2517207

---
diff --git a/.gitignore b/.gitignore
index 8b32771..61dea87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /cap-primitives-0.21.1.crate
 /cap-primitives-0.22.1.crate
 /cap-primitives-0.24.2.crate
+/cap-primitives-4.0.2.crate

diff --git a/cap-primitives-4.0.2-no-cap_tempfile.patch b/cap-primitives-4.0.2-no-cap_tempfile.patch
new file mode 100644
index 0000000..68aca54
--- /dev/null
+++ b/cap-primitives-4.0.2-no-cap_tempfile.patch
@@ -0,0 +1,12 @@
+diff -Naur cap-primitives-4.0.2-original/src/fs/read_link.rs cap-primitives-4.0.2/src/fs/read_link.rs
+--- cap-primitives-4.0.2-original/src/fs/read_link.rs	2006-07-24 02:21:28.000000000 +0100
++++ cap-primitives-4.0.2/src/fs/read_link.rs	2026-08-14 15:29:43.501838281 +0100
+@@ -87,6 +87,8 @@
+     }
+ }
+ 
++// Downstream: ignore this because it would require cap_tempfile
++#[cfg(false)]
+ #[cfg(not(windows))]
+ #[test]
+ fn test_read_link_contents() {

diff --git a/cap-primitives-fix-metadata-auto.diff b/cap-primitives-fix-metadata-auto.diff
new file mode 100644
index 0000000..f6877b0
--- /dev/null
+++ b/cap-primitives-fix-metadata-auto.diff
@@ -0,0 +1,21 @@
+--- cap-primitives-4.0.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ cap-primitives-4.0.2/Cargo.toml	2026-08-14T14:31:35.729367+00:00
+@@ -79,18 +79,3 @@
+     "time",
+ ]
+ 
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = ">=0.60, <0.62"
+-features = [
+-    "Win32_Foundation",
+-    "Win32_Security",
+-    "Win32_Storage_FileSystem",
+-    "Win32_System_Kernel",
+-    "Win32_System_WindowsProgramming",
+-    "Win32_System_IO",
+-    "Wdk_Storage_FileSystem",
+-    "Wdk_Foundation",
+-]
+-
+-[target."cfg(windows)".dependencies.winx]
+-version = "0.36.0"

diff --git a/cap-primitives-fix-metadata.diff b/cap-primitives-fix-metadata.diff
deleted file mode 100644
index ad9ca7b..0000000
--- a/cap-primitives-fix-metadata.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- cap-primitives-0.24.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ cap-primitives-0.24.2/Cargo.toml	2022-04-13T22:28:15.357300+00:00
-@@ -45,17 +45,3 @@
- [target."cfg(not(windows))".dependencies.rustix]
- version = "0.33.0"
- features = ["procfs"]
--[target."cfg(target_os = \"ios\")".dependencies.errno]
--version = "0.2.8"
--default-features = false
--[target."cfg(target_os = \"macos\")".dependencies.errno]
--version = "0.2.8"
--default-features = false
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--
--[target."cfg(windows)".dependencies.winapi-util]
--version = "0.1.5"
--
--[target."cfg(windows)".dependencies.winx]
--version = "0.31.0"

diff --git a/rust-cap-primitives.spec b/rust-cap-primitives.spec
index 5c3ae2c..f9389b8 100644
--- a/rust-cap-primitives.spec
+++ b/rust-cap-primitives.spec
@@ -1,25 +1,23 @@
-# Generated by rust2rpm 21
-%bcond_without check
+# Generated by rust2rpm 28
+%bcond check 1
 %global debug_package %{nil}
 
 %global crate cap-primitives
 
-Name:           rust-%{crate}
-Version:        0.24.2
+Name:           rust-cap-primitives
+Version:        4.0.2
 Release:        %autorelease
 Summary:        Capability-based primitives
 
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License:        ASL 2.0 or MIT
+License:        Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
 URL:            https://crates.io/crates/cap-primitives
 Source:         %{crates_source}
-# Initial patched metadata
-# * drop non-linux dependencies
-Patch0:         cap-primitives-fix-metadata.diff
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch:          cap-primitives-fix-metadata-auto.diff
+# * Downstream-only: omit a test that would require cap_tempfile
+Patch10:        cap-primitives-4.0.2-no-cap_tempfile.patch
 
-ExclusiveArch:  %{rust_arches}
-
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Capability-based primitives.}
@@ -68,7 +66,7 @@ use the "arbitrary" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires

diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..a5c18c6
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,6 @@
+[[package.extra-patches]]
+number = 10
+file = "cap-primitives-4.0.2-no-cap_tempfile.patch"
+comments = [
+    "Downstream-only: omit a test that would require cap_tempfile",
+]

diff --git a/sources b/sources
index 463de8b..0779a73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cap-primitives-0.24.2.crate) = 36f3b0f87406aa44446fdd332c015858ccd4a11b321bfad34d4569c4e7ea54303a73a3f0285ea47b97e02926b4a2c72255b0e8ac49d60b531ce814e1114274f4
+SHA512 (cap-primitives-4.0.2.crate) = 3ae7016b2795743dde8887e91b953b46d4b4aa882b92fdce66ed97687ebd8f2474d63efa89ad65a7cc9fe2a56e74e924f9e18badbc88cd45fa6efb10c94edc21

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-25  9:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-25  9:22 [rpms/rust-cap-primitives] f45: Unretire and update to version 4.0.2; Fixes RHBZ#2517207 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox