From ba5fd19357eea5df8f1ee67af717688e14fafad1 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 9 Nov 2020 16:34:55 +0100
Subject: [PATCH] update to version 0.3.20

---
 .gitignore                  |  1 +
 rust-structopt.spec         | 53 +++++++++++--------------------------
 sources                     |  2 +-
 structopt-fix-metadata.diff | 24 +++++++++++++++++
 4 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 structopt-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 7a746fc..5c0d93e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /structopt-0.3.15.crate
 /structopt-0.3.17.crate
 /structopt-0.3.18.crate
+/structopt-0.3.20.crate
diff --git a/rust-structopt.spec b/rust-structopt.spec
index afc449d..ec89c37 100644
--- a/rust-structopt.spec
+++ b/rust-structopt.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 15
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate structopt
 
 Name:           rust-%{crate}
-Version:        0.3.18
+Version:        0.3.20
 Release:        1%{?dist}
 Summary:        Parse command line argument by defining a struct
 
@@ -13,6 +13,10 @@ 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
+# * drop lints feature: clippy crate is not packaged
+# * drop paw feature: paw is not packaged
+Patch0:         structopt-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -88,18 +92,6 @@ which use "doc" feature of "%{crate}" crate.
 %files       -n %{name}+doc-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
-%package     -n %{name}+lints-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+lints-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "lints" feature of "%{crate}" crate.
-
-%files       -n %{name}+lints-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
 %package     -n %{name}+no_cargo-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -112,30 +104,6 @@ which use "no_cargo" feature of "%{crate}" crate.
 %files       -n %{name}+no_cargo-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
-%package     -n %{name}+paw-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+paw-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "paw" feature of "%{crate}" crate.
-
-%files       -n %{name}+paw-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package     -n %{name}+paw_dep-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+paw_dep-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "paw_dep" feature of "%{crate}" crate.
-
-%files       -n %{name}+paw_dep-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
 %package     -n %{name}+suggestions-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -174,6 +142,10 @@ which use "yaml" feature of "%{crate}" crate.
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
+# remove executable bit from ... everything
+for i in $(find -type f -executable); do
+    chmod a-x $i;
+done
 %cargo_prep
 
 %generate_buildrequires
@@ -193,6 +165,11 @@ which use "yaml" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Mon Nov  9 2020 Fabio Valentini <decathorpe@gmail.com> - 0.3.20-1
+- Update to version 0.3.20.
+- Drop "lints" and "paw" features with broken dependencies.
+- Fixes RHBZ#1886429
+
 * Wed Sep 23 2020 Fabio Valentini <decathorpe@gmail.com> - 0.3.18-1
 - Update to version 0.3.18.
 
diff --git a/sources b/sources
index dcfb1da..f462e43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (structopt-0.3.18.crate) = 5392760ee0d39d46dc4715f0e4da1d2d7488b45db9e29e9b72a95eade85a1a7e7300274907dcdfe786a3c44412b01fae243f4ac28691f086e7545bc574e85234
+SHA512 (structopt-0.3.20.crate) = cdbd409fb5443622184a21b108c6ed854676912dc599b0dfbe3a4d229184f3690739dc931c80e55aa43730ff8c66ea4b65e92f8739e81f26f3f45a4c75c7e845
diff --git a/structopt-fix-metadata.diff b/structopt-fix-metadata.diff
new file mode 100644
index 0000000..4808524
--- /dev/null
+++ b/structopt-fix-metadata.diff
@@ -0,0 +1,24 @@
+--- 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"
+ 
+-[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"]