public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-zip] epel10: Update to version 8.3.1
@ 2026-06-03 20:38 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-06-03 20:38 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-zip
Branch : epel10
Commit : 313c3b47d994779ca8cce15505ff948ec73b0ce3
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-05-20T22:36:27+01:00
Stats  : +51/-38 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-zip/c/313c3b47d994779ca8cce15505ff948ec73b0ce3?branch=epel10

Log:
Update to version 8.3.1

---
diff --git a/.gitignore b/.gitignore
index d0dd0d3..e1c6be4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@
 /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

diff --git a/0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch b/0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch
new file mode 100644
index 0000000..18140b1
--- /dev/null
+++ b/0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch
@@ -0,0 +1,35 @@
+From 2cd4be9463b86ed5e0a4a17f052ac2400312060c Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Wed, 20 May 2026 22:07:30 +0100
+Subject: [PATCH] Downstream: patch out tests that would need omitted test
+ files
+
+---
+ src/read.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/read.rs b/src/read.rs
+index 306c07fd..213a8ec7 100644
+--- a/src/read.rs
++++ b/src/read.rs
+@@ -2421,6 +2421,8 @@ mod tests {
+ 
+     #[test]
+     #[cfg(feature = "deflate-flate2")]
++    // Downstream patch: we do not include the test file needed for this test.
++    #[cfg(any())]
+     fn test_utf8_extra_field() {
+         use super::ZipArchive;
+ 
+@@ -2530,6 +2532,8 @@ mod tests {
+     /// Only on little endian because we cannot use fs with miri CI
+     #[cfg(all(target_endian = "little", not(miri)))]
+     #[test]
++    // Downstream patch: we do not include the test file needed for this test.
++    #[cfg(any())]
+     fn test_central_directory_not_at_end() -> ZipResult<()> {
+         use super::ZipArchive;
+ 
+-- 
+2.54.0
+

diff --git a/rust-zip.spec b/rust-zip.spec
index 3b00032..2b10d62 100644
--- a/rust-zip.spec
+++ b/rust-zip.spec
@@ -5,7 +5,7 @@
 %global crate zip
 
 Name:           rust-zip
-Version:        8.3.0
+Version:        8.3.1
 Release:        %autorelease
 Summary:        Library to support the reading and writing of zip files
 
@@ -30,7 +30,7 @@ Patch:          zip-fix-metadata-auto.diff
 Patch:          zip-fix-metadata.diff
 # * Downstream-only: patch out tests that would need omitted test files to
 #   compile
-Patch10:        zip-6.0.0-omitted-test-files.patch
+Patch10:        0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -57,7 +57,6 @@ use the "%{crate}" crate.
 %doc %{crate_instdir}/SECURITY.md
 %{crate_instdir}/
 %exclude %{crate_instdir}/cliff.toml
-%exclude %{crate_instdir}/pull_request_template.md
 %exclude %{crate_instdir}/release-plz.toml
 
 %package     -n %{name}+default-devel

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 6999ad0..109f250 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -7,10 +7,8 @@ Patch out the deflate-flate2-zlib-ng-compat feature, which requires \
 flate2/zlib-ng-compat, not packaged.\
 """,
 ]
-doc-files.exclude = ["pull_request_template.md"]
 exclude-crate-files = [
     "cliff.toml",
-    "pull_request_template.md",
     "release-plz.toml",
 ]
 
@@ -34,7 +32,7 @@ comments = [
 
 [[package.extra-patches]]
 number = 10
-file = "zip-6.0.0-omitted-test-files.patch"
+file = "0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch"
 comments = [
     """\
 Downstream-only: patch out tests that would need omitted test files to compile\

diff --git a/sources b/sources
index 18f52e0..28a8d12 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (zip-8.3.0.crate) = b2de5139a6adc297520512bc87a2896ae7ce9b9defe6826f8e30b11e58f56a32ae88059d281e19dd78f614c0186ba547d2f97bd18d76f738cbc52f950eab1c03
-SHA512 (zip2-8.3.0-filtered.tar.gz) = 8aab6bd23fe94f98363be8813f6ba9bf872ba0e8b167f5cf3ec7ece161005917b9170c9ebcafdda61c11dd67a049d190f9c9adac085650d9e2ad6bf9299747a5
+SHA512 (zip-8.3.1.crate) = e29e9e62dd02263ecffcbabfcfc9b81482894008e7b31c135f6c245907eeefc5e306f86bf8a56fb957f7d9a452beb04739e022117758bf6b63656ebfaa5332ee
+SHA512 (zip2-8.3.1-filtered.tar.gz) = 3b27a28a80938aeb0ad5dbfd83b0e258dad43bf145b0d3f54016eeb054df6bcecfd01918ef9b95c93e1ef03a892a44749107bc2ac1b94abe9e7861322b6cc7b9

diff --git a/zip-6.0.0-omitted-test-files.patch b/zip-6.0.0-omitted-test-files.patch
deleted file mode 100644
index 9bc23c1..0000000
--- a/zip-6.0.0-omitted-test-files.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur zip-6.0.0-original/src/read.rs zip-6.0.0/src/read.rs
---- zip-6.0.0-original/src/read.rs	2006-07-24 02:21:28.000000000 +0100
-+++ zip-6.0.0/src/read.rs	2025-12-17 11:48:28.449459541 +0000
-@@ -2316,6 +2316,8 @@
- 
-     #[test]
-     #[cfg(feature = "deflate-flate2")]
-+    // Downstream patch: we do not include the test file needed for this test.
-+    #[cfg(any())]
-     fn test_utf8_extra_field() {
-         let mut reader =
-             ZipArchive::new(Cursor::new(include_bytes!("../tests/data/chinese.zip"))).unwrap();
-@@ -2399,6 +2401,8 @@
-     }
- 
-     #[test]
-+    // Downstream patch: we do not include the test file needed for this test.
-+    #[cfg(any())]
-     fn test_central_directory_not_at_end() -> ZipResult<()> {
-         let mut reader = ZipArchive::new(Cursor::new(include_bytes!("../tests/data/omni.ja")))?;
-         let mut file = reader.by_name("chrome.manifest")?;

diff --git a/zip-fix-metadata-auto.diff b/zip-fix-metadata-auto.diff
index 749fada..2935683 100644
--- a/zip-fix-metadata-auto.diff
+++ b/zip-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- zip-8.3.0/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ zip-8.3.0/Cargo.toml	2026-05-20T20:44:07.073565+00:00
-@@ -277,25 +277,3 @@
+--- zip-8.3.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ zip-8.3.1/Cargo.toml	2026-05-20T21:09:58.892328+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 82064a4..3850806 100644
--- a/zip-fix-metadata.diff
+++ b/zip-fix-metadata.diff
@@ -1,6 +1,6 @@
---- zip-8.3.0/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ zip-8.3.0/Cargo.toml	2026-05-20T20:44:07.075530+00:00
-@@ -110,10 +110,6 @@
+--- zip-8.3.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ zip-8.3.1/Cargo.toml	2026-05-20T21:09:58.893633+00:00
+@@ -108,10 +108,6 @@
      "deflate-flate2",
      "flate2/zlib-ng",
  ]
@@ -11,7 +11,7 @@
  deflate-flate2-zlib-rs = [
      "deflate-flate2",
      "flate2/zlib-rs",
-@@ -126,7 +122,6 @@
+@@ -124,7 +120,6 @@
  jiff-02 = ["dep:jiff"]
  legacy-zip = ["bitstream-io"]
  lzma = ["dep:lzma-rust2"]
@@ -19,7 +19,7 @@
  ppmd = ["dep:ppmd-rust"]
  time = ["dep:time"]
  unreserved = []
-@@ -202,11 +197,6 @@
+@@ -200,11 +195,6 @@
  [dependencies.memchr]
  version = "2.7"
  
@@ -31,7 +31,7 @@
  [dependencies.pbkdf2]
  version = "0.12"
  optional = true
-@@ -234,13 +224,6 @@
+@@ -232,13 +222,6 @@
  version = "^0.13.3"
  optional = true
  default-features = false

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

only message in thread, other threads:[~2026-06-03 20:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-03 20:38 [rpms/rust-zip] epel10: Update to version 8.3.1 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