diff --git a/.gitignore b/.gitignore index 43a5c35..5af29d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,60 +1,2 @@ -/zip-0.5.6.crate -/zip-0.5.8.crate -/zip-0.5.9.crate -/zip-0.5.11.crate -/zip-0.5.12.crate -/zip-0.5.13.crate -/zip-0.6.4.crate -/zip-0.6.6.crate -/zip-1.1.4.crate -/zip2-1.1.4.tar.gz -/zip-2.1.0.crate -/zip2-2.1.0-filtered.tar.gz -/zip-2.1.3.crate -/zip2-2.1.3-filtered.tar.gz -/zip-2.1.4.crate -/zip2-2.1.4-filtered.tar.gz -/zip-2.1.5.crate -/zip2-2.1.5-filtered.tar.gz -/zip-2.2.2.crate -/zip2-2.2.2-filtered.tar.gz -/zip-2.2.3.crate -/zip2-2.2.3-filtered.tar.gz -/zip-2.3.0.crate -/zip2-2.3.0-filtered.tar.gz -/zip-2.4.0.crate -/zip2-2.4.0-filtered.tar.gz -/zip-2.4.1.crate -/zip2-2.4.1-filtered.tar.gz -/zip-2.4.2.crate -/zip2-2.4.2-filtered.tar.gz -/zip-2.5.0.crate -/zip2-2.5.0-filtered.tar.gz -/zip-2.6.0.crate -/zip2-2.6.0-filtered.tar.gz -/zip-2.6.1.crate -/zip2-2.6.1-filtered.tar.gz -/zip-3.0.0.crate -/zip2-3.0.0-filtered.tar.gz -/zip-6.0.0.crate -/zip2-6.0.0-filtered.tar.gz -/zip-7.0.0.crate -/zip2-7.0.0-filtered.tar.gz -/zip-7.2.0.crate -/zip2-7.2.0-filtered.tar.gz -/zip-8.1.0.crate -/zip2-8.1.0-filtered.tar.gz -/zip-8.2.0.crate -/zip2-8.2.0-filtered.tar.gz -/zip-8.3.0.crate -/zip2-8.3.0-filtered.tar.gz -/zip-8.3.1.crate -/zip2-8.3.1-filtered.tar.gz -/zip-8.4.0.crate -/zip2-8.4.0-filtered.tar.gz -/zip-8.5.0.crate -/zip2-8.5.0-filtered.tar.gz -/zip-8.5.1.crate -/zip2-8.5.1-filtered.tar.gz -/zip-8.6.0.crate -/zip2-8.6.0-filtered.tar.gz +/zip-*.crate +/zip2-*-filtered.tar.gz diff --git a/rust-zip.spec b/rust-zip.spec index 79e4cc5..11cb02f 100644 --- a/rust-zip.spec +++ b/rust-zip.spec @@ -27,9 +27,10 @@ Patch: zip-fix-metadata-auto.diff # * Patch out the nt-time features; rust-nt-time not yet packaged # * Patch out the deflate-flate2-zlib-ng-compat feature, which requires # flate2/zlib-ng-compat, not packaged. -# * Update lzma-rust2 to 0.19: https://github.com/zip-rs/zip2/pull/891, +# * Update lzma-rust2 to 0.20: https://github.com/zip-rs/zip2/pull/891, # https://github.com/zip-rs/zip2/pull/905, -# https://github.com/zip-rs/zip2/pull/942 +# https://github.com/zip-rs/zip2/pull/942, +# https://github.com/zip-rs/zip2/pull/963 Patch: zip-fix-metadata.diff # * Downstream-only: patch out tests that would need omitted test files to # compile diff --git a/rust2rpm.toml b/rust2rpm.toml index c618596..954cb32 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -7,9 +7,10 @@ Patch out the deflate-flate2-zlib-ng-compat feature, which requires \ flate2/zlib-ng-compat, not packaged.\ """, """\ -Update lzma-rust2 to 0.19: https://github.com/zip-rs/zip2/pull/891, \ +Update lzma-rust2 to 0.20: https://github.com/zip-rs/zip2/pull/891, \ https://github.com/zip-rs/zip2/pull/905, \ -https://github.com/zip-rs/zip2/pull/942\ +https://github.com/zip-rs/zip2/pull/942, \ +https://github.com/zip-rs/zip2/pull/963\ """, ] exclude-crate-files = [ diff --git a/zip-fix-metadata-auto.diff b/zip-fix-metadata-auto.diff index 35c6a5d..8c685fd 100644 --- a/zip-fix-metadata-auto.diff +++ b/zip-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- zip-8.6.0/Cargo.toml 2006-07-24T01:21:28+00:00 -+++ zip-8.6.0/Cargo.toml 2026-08-17T06:39:04.620736+00:00 ++++ zip-8.6.0/Cargo.toml 2026-09-01T05:56:06.226750+00:00 @@ -275,25 +275,3 @@ version = "0.4" default-features = false diff --git a/zip-fix-metadata.diff b/zip-fix-metadata.diff index ed41730..e606e15 100644 --- a/zip-fix-metadata.diff +++ b/zip-fix-metadata.diff @@ -1,5 +1,5 @@ --- zip-8.6.0/Cargo.toml 2006-07-24T01:21:28+00:00 -+++ zip-8.6.0/Cargo.toml 2026-08-17T06:39:13.369936+00:00 ++++ zip-8.6.0/Cargo.toml 2026-09-01T05:56:26.634583+00:00 @@ -108,10 +108,6 @@ "deflate-flate2", "flate2/zlib-ng", @@ -24,7 +24,7 @@ [dependencies.lzma-rust2] -version = "^0.16.1" -+version = "^0.19.0" ++version = "^0.20.0" features = [ "std", "encoder",