From 0d59c1a8411a13729995ac4e63be3b0aa650e083 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sun, 18 Jul 2021 17:37:53 +0200
Subject: [PATCH] Update to version 0.3.22; Fixes RHBZ#1979061

---
 .gitignore                  |  1 +
 rust-structopt.spec         | 13 ++++++++-----
 sources                     |  2 +-
 structopt-fix-metadata.diff | 33 ++++++++++-----------------------
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9943d7..bcc009c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /structopt-0.3.18.crate
 /structopt-0.3.20.crate
 /structopt-0.3.21.crate
+/structopt-0.3.22.crate
diff --git a/rust-structopt.spec b/rust-structopt.spec
index c28deb8..1b8723f 100644
--- a/rust-structopt.spec
+++ b/rust-structopt.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 18
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate structopt
 
 Name:           rust-%{crate}
-Version:        0.3.21
+Version:        0.3.22
 Release:        %autorelease
 Summary:        Parse command line argument by defining a struct
 
@@ -13,6 +13,9 @@ Summary:        Parse command line argument by defining a struct
 License:        ASL 2.0 or MIT
 URL:            https://crates.io/crates/structopt
 Source:         %{crates_source}
+# Initial patched metadata
+# * bump strum from 0.20 to 0.21: https://github.com/TeXitoi/structopt/pull/485
+Patch0:         structopt-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -36,8 +39,8 @@ This package contains library source intended for building other packages
 which use "%{crate}" crate.
 
 %files          devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md CHANGELOG.md
+%license LICENSE-MIT LICENSE-APACHE
+%doc examples README.md CHANGELOG.md examples/README.md
 %{cargo_registry}/%{crate}-%{version_no_tilde}/
 
 %package     -n %{name}+default-devel
@@ -152,7 +155,7 @@ which use "yaml" feature of "%{crate}" crate.
 %if %{with check}
 %check
 # * flatten_twice is marked should_panic, but gets a hard error from clap
-# * ui tests fail for unknown reason
+# * ui test fails because of missing paw dependency
 %cargo_test -- -- --skip flatten_twice --skip ui
 %endif
 
diff --git a/sources b/sources
index 5ffc548..918f926 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (structopt-0.3.21.crate) = df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+SHA512 (structopt-0.3.22.crate) = fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
diff --git a/structopt-fix-metadata.diff b/structopt-fix-metadata.diff
index 4808524..1a97f4c 100644
--- a/structopt-fix-metadata.diff
+++ b/structopt-fix-metadata.diff
@@ -1,24 +1,11 @@
---- structopt-0.3.20/Cargo.toml	2020-10-12T15:58:48+00:00
-+++ structopt-0.3.20/Cargo.toml	2020-11-09T15:21:49.624410+00:00
-@@ -29,11 +29,6 @@
- [dependencies.lazy_static]
- version = "1.4.0"
+--- structopt-0.3.22/Cargo.toml	1970-01-01T00:00:00+00:00
++++ structopt-0.3.22/Cargo.toml	2021-07-18T15:12:21.160498+00:00
+@@ -40,7 +40,7 @@
+ version = "1"
  
--[dependencies.paw_dep]
--version = "1"
--optional = true
--package = "paw"
--
- [dependencies.structopt-derive]
- version = "=0.4.13"
- [dev-dependencies.rustversion]
-@@ -48,9 +43,7 @@
- debug = ["clap/debug"]
- default = ["clap/default"]
- doc = ["clap/doc"]
--lints = ["clap/lints"]
- no_cargo = ["clap/no_cargo"]
--paw = ["structopt-derive/paw", "paw_dep"]
- suggestions = ["clap/suggestions"]
- wrap_help = ["clap/wrap_help"]
- yaml = ["clap/yaml"]
+ [dev-dependencies.strum]
+-version = "0.20"
++version = "0.21"
+ features = ["derive"]
+ 
+ [dev-dependencies.trybuild]