Upgrade to opaque-debug 0.3

0001-Upgrade-to-opaque-debug-0.3.patch

@@ -0,0 +1,54 @@
+From cb46043221156413192aab8b01b885deb72ff133 Mon Sep 17 00:00:00 2001
+From: Josh Stone <cuviper@gmail.com>
+Date: Mon, 20 Jul 2020 14:42:53 -0700
+Subject: [PATCH] Upgrade to opaque-debug 0.3
+
+---
+ des/src/des.rs  | 2 +-
+ des/src/lib.rs  | 3 ---
+ des/src/tdes.rs | 8 ++++----
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/des/src/des.rs b/des/src/des.rs
+index 720c2f71153f..971ad9c22424 100644
+--- a/src/des.rs
++++ b/src/des.rs
+@@ -209,4 +209,4 @@ impl BlockCipher for Des {
+     }
+ }
+ 
+-impl_opaque_debug!(Des);
++opaque_debug::implement!(Des);
+diff --git a/des/src/lib.rs b/des/src/lib.rs
+index 735babee09f7..270e75f97af8 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -7,9 +7,6 @@
+ #![forbid(unsafe_code)]
+ #![warn(missing_docs, rust_2018_idioms)]
+ 
+-#[macro_use]
+-extern crate opaque_debug;
+-
+ pub use block_cipher;
+ 
+ mod consts;
+diff --git a/des/src/tdes.rs b/des/src/tdes.rs
+index 5e213a37e03d..ce0d5bc7beb3 100644
+--- a/src/tdes.rs
++++ b/src/tdes.rs
+@@ -198,7 +198,7 @@ impl BlockCipher for TdesEee2 {
+     }
+ }
+ 
+-impl_opaque_debug!(TdesEde3);
+-impl_opaque_debug!(TdesEee3);
+-impl_opaque_debug!(TdesEde2);
+-impl_opaque_debug!(TdesEee2);
++opaque_debug::implement!(TdesEde3);
++opaque_debug::implement!(TdesEee3);
++opaque_debug::implement!(TdesEde2);
++opaque_debug::implement!(TdesEee2);
+-- 
+2.26.2
+

des-fix-metadata.diff

@@ -0,0 +1,11 @@
+--- des-0.4.0/Cargo.toml	2020-06-08T14:33:24+00:00
++++ des-0.4.0/Cargo.toml	2020-07-20T21:45:19.898007+00:00
+@@ -30,7 +30,7 @@
+ default-features = false
+ 
+ [dependencies.opaque-debug]
+-version = "0.2"
++version = "0.3"
+ [dev-dependencies.block-cipher]
+ version = "0.7"
+ features = ["dev"]

rust-des.spec

@@ -6,13 +6,17 @@
 
 Name:           rust-%{crate}
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DES and Triple DES (3DES, TDES) block ciphers implementation
 
 # Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/des
 Source:         %{crates_source}
+# Initial patched metadata
+# * Upgrade to opaque-debug 0.3, https://github.com/RustCrypto/block-ciphers/pull/140
+Patch0:         des-fix-metadata.diff
+Patch1:         0001-Upgrade-to-opaque-debug-0.3.patch
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -71,6 +75,9 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Mon Jul 20 2020 Josh Stone <jistone@redhat.com> - 0.4.0-2
+- Upgrade to opaque-debug 0.3
+
 * Mon Jun 22 08:15:06 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0