From 6643edaebc366923ad8528846a9d82412097f78c Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 10 Sep 2020 17:53:19 -0700
Subject: [PATCH] Update to 0.5.8

---
 .gitignore              |  1 +
 rust-zip.spec           | 22 +++++++++++++++++-----
 sources                 |  2 +-
 zip-update-walkdir.diff | 12 ------------
 4 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 zip-update-walkdir.diff

diff --git a/.gitignore b/.gitignore
index ef8036a..1c1cb09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /zip-0.5.6.crate
+/zip-0.5.8.crate
diff --git a/rust-zip.spec b/rust-zip.spec
index b8a8556..deddcef 100644
--- a/rust-zip.spec
+++ b/rust-zip.spec
@@ -5,17 +5,14 @@
 %global crate zip
 
 Name:           rust-%{crate}
-Version:        0.5.6
-Release:        2%{?dist}
+Version:        0.5.8
+Release:        1%{?dist}
 Summary:        Library to support the reading and writing of zip files
 
 # Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/zip
 Source:         %{crates_source}
-# Update walkdir to the version in Fedora
-# https://github.com/mvdnes/zip-rs/pull/169
-Patch0:         zip-update-walkdir.diff
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -55,6 +52,18 @@ which use "default" feature of "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
+%package     -n %{name}+bzip2-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+bzip2-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "bzip2" feature of "%{crate}" crate.
+
+%files       -n %{name}+bzip2-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
 %package     -n %{name}+deflate-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -134,6 +143,9 @@ which use "time" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Fri Sep 11 2020 Josh Stone <jistone@redhat.com> - 0.5.8-1
+- Update to 0.5.8
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index c89fe78..1b4fe94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zip-0.5.6.crate) = e78ccef45715e49228443324057e94046ebd4e0b992f4d91eb680263a7d71aed931d19dd45bf0b18f8a9507a4716cb2f3c7a3888fed0b9a6fba3e65e74125e90
+SHA512 (zip-0.5.8.crate) = 758d6c51f44fb0151176c0ec24d493c2f159a00c6f44d118568b1096676eb115ae4874556b7031a5f8ba0b17f3b48b6e355c340e7ea38b196d3df077cfdef344
diff --git a/zip-update-walkdir.diff b/zip-update-walkdir.diff
deleted file mode 100644
index 127dff6..0000000
--- a/zip-update-walkdir.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru zip-0.5.6.orig/Cargo.toml zip-0.5.6/Cargo.toml
---- zip-0.5.6.orig/Cargo.toml	2020-06-13 08:29:17.000000000 -0700
-+++ zip-0.5.6/Cargo.toml	2020-06-28 08:48:57.102465250 -0700
-@@ -49,7 +49,7 @@
- version = "0.4"
- 
- [dev-dependencies.walkdir]
--version = "1.0"
-+version = "2.3"
- 
- [features]
- default = ["bzip2", "deflate", "time"]