From 25b752c3efc70523d716724e6235bab28dcdacb6 Mon Sep 17 00:00:00 2001 From: blinxen Date: Wed, 22 Jan 2025 21:21:21 +0100 Subject: [PATCH] Update to version 0.19.0 (rhbz#2321141) --- .gitignore | 1 + decrease-zip-version.diff | 20 ++++++++++---------- rust-gix-archive.spec | 6 +++--- sources | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 33c116d..ac7436f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gix-archive-0.13.1.crate /gix-archive-0.13.2.crate /gix-archive-0.15.0.crate +/gix-archive-0.19.0.crate diff --git a/decrease-zip-version.diff b/decrease-zip-version.diff index 232c1b3..a9b6edc 100644 --- a/decrease-zip-version.diff +++ b/decrease-zip-version.diff @@ -1,7 +1,7 @@ ---- gix-archive-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ gix-archive-0.15.0/Cargo.toml 2024-09-07T18:05:21.490769+00:00 -@@ -76,7 +76,7 @@ - version = "1.0.26" +--- gix-archive-0.19.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ gix-archive-0.19.0/Cargo.toml 2025-01-22T19:05:55.626544+00:00 +@@ -77,7 +77,7 @@ + version = "2.0.0" [dependencies.zip] -version = "2.1.0" @@ -9,18 +9,18 @@ features = ["deflate"] optional = true default-features = false ---- gix-archive-0.15.0/src/write.rs -+++ gix-archive-0.15.0/src/write.rs -@@ -126,7 +127,7 @@ where +--- gix-archive-0.19.0/src/write.rs ++++ gix-archive-0.19.0/src/write.rs +@@ -126,7 +126,7 @@ where NextFn: FnMut(&mut Stream) -> Result>, gix_worktree_stream::entry::Error>, { let compression_level = match opts.format { -- Format::Zip { compression_level } => compression_level.map(|lvl| lvl as i64), +- Format::Zip { compression_level } => compression_level.map(i64::from), + Format::Zip { compression_level } => compression_level.map(|lvl| lvl as i32), _other => return write_stream(stream, next_entry, out, opts), }; -@@ -149,7 +150,7 @@ where +@@ -149,7 +149,7 @@ where zdt.minute().try_into().expect("non-negative"), zdt.second().try_into().expect("non-negative"), ) @@ -29,7 +29,7 @@ while let Some(entry) = next_entry(stream)? { append_zip_entry( &mut ar, -@@ -173,10 +174,10 @@ fn append_zip_entry( +@@ -173,10 +173,10 @@ fn append_zip_entry( mut entry: gix_worktree_stream::Entry<'_>, buf: &mut Vec, mtime: zip::DateTime, diff --git a/rust-gix-archive.spec b/rust-gix-archive.spec index 632cfce..e737bf1 100644 --- a/rust-gix-archive.spec +++ b/rust-gix-archive.spec @@ -1,13 +1,13 @@ -# Generated by rust2rpm 26 +# Generated by rust2rpm 27 # * Deactivate tests because of a missing dev-dependency (gix-testtools) # * See https://github.com/Byron/gitoxide/discussions/900 for more information -%bcond_with check +%bcond check 0 %global debug_package %{nil} %global crate gix-archive Name: rust-gix-archive -Version: 0.15.0 +Version: 0.19.0 Release: %autorelease Summary: Archive generation from of a worktree stream diff --git a/sources b/sources index 90d94f0..1fc31ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gix-archive-0.15.0.crate) = ca2fe98ed93f8030ce388cce365fec52d58fd38ef588f14d20af7c9e021e558a34391d9c63847630adf47e627d76907ecb16734c96c011fefa8240f85f997c91 +SHA512 (gix-archive-0.19.0.crate) = 6f5ffd9563ecfd9b1a48aaecea4169b47f7537e54e1e02a9ab8b680ae7b228e23d6ad2ce2abdd89f80f56c6c338cdacc27fdef12c95f28150f099d75cb1faced