diff --git a/.gitignore b/.gitignore index 3bd639c..44a2517 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /hyperfine-1.12.0.crate /hyperfine-1.14.0.crate /hyperfine-1.16.1.crate +/hyperfine-1.17.0.crate diff --git a/hyperfine-fix-metadata-auto.diff b/hyperfine-fix-metadata-auto.diff index cecf81e..6584045 100644 --- a/hyperfine-fix-metadata-auto.diff +++ b/hyperfine-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- hyperfine-1.16.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ hyperfine-1.16.1/Cargo.toml 2023-03-27T09:24:23.791230+00:00 -@@ -100,9 +100,6 @@ +--- hyperfine-1.17.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ hyperfine-1.17.0/Cargo.toml 2023-06-04T15:29:04.391654+00:00 +@@ -102,9 +102,6 @@ [features] windows_process_extensions_main_thread_handle = [] @@ -10,17 +10,16 @@ [target."cfg(not(windows))".dependencies.libc] version = "0.2" -@@ -110,13 +107,3 @@ +@@ -112,12 +109,3 @@ version = "0.26.2" features = ["zerocopy"] --[target."cfg(windows)".dependencies.winapi] --version = "0.3" +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" -features = [ -- "processthreadsapi", -- "minwindef", -- "winnt", -- "jobapi2", -- "tlhelp32", -- "handleapi", +- "Win32_Foundation", +- "Win32_Security", +- "Win32_System_JobObjects", +- "Win32_System_LibraryLoader", +- "Win32_System_Threading", -] diff --git a/hyperfine-fix-metadata.diff b/hyperfine-fix-metadata.diff new file mode 100644 index 0000000..fbdacb1 --- /dev/null +++ b/hyperfine-fix-metadata.diff @@ -0,0 +1,10 @@ +--- hyperfine-1.17.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ hyperfine-1.17.0/Cargo.toml 2023-06-04T15:29:12.344688+00:00 +@@ -26,7 +26,6 @@ + [profile.release] + lto = true + codegen-units = 1 +-strip = true + + [dependencies.anyhow] + version = "1.0" diff --git a/rust-hyperfine.spec b/rust-hyperfine.spec index de9a0ef..826374e 100644 --- a/rust-hyperfine.spec +++ b/rust-hyperfine.spec @@ -4,7 +4,7 @@ %global crate hyperfine Name: rust-hyperfine -Version: 1.16.1 +Version: 1.17.0 Release: %autorelease Summary: Command-line benchmarking tool @@ -14,6 +14,9 @@ URL: https://crates.io/crates/hyperfine Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: hyperfine-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# * drop incompatible "strip = true" cargo setting +Patch: hyperfine-fix-metadata.diff BuildRequires: rust-packaging >= 23 @@ -31,7 +34,7 @@ Summary: %{summary} # MIT OR Apache-2.0 # MPL-2.0 # Unlicense OR MIT -License: MIT AND MPL-2.0 AND (Apache-2.0 OR BSL-1.0) +License: MIT AND MPL-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} diff --git a/sources b/sources index 6473fc6..c9179a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hyperfine-1.16.1.crate) = 9540b4e1270132f04837cccf8d7f94da457758b9d328b254dbe963d3b5b609c1928db2331d8bc3ba728603b1e293928e2610154d13e9f4ffc8b50b874765bb88 +SHA512 (hyperfine-1.17.0.crate) = 3101883b694bd641b83bb7b93a9b30a7e3b0c61f70473d179c5b32b6ca3cfdff339e1f80a017742e24be77cbc03891f42b6aa49da604e5ac1f6da1e76e5cfe69