From 65bb49135d680f290d259eb5e6e2d5df3fb744e1 Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@fedoraproject.org>
Date: Wed, 3 Jan 2024 15:45:17 -0600
Subject: [PATCH] Update to 0.6.0

- Migrate to rust2rpm.toml

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
---
 .gitignore                      |  1 +
 build-fs-tree-fix-metadata.diff | 13 +++++++------
 rust-build-fs-tree.spec         | 20 ++++++++++++++++----
 rust2rpm.conf                   |  6 ------
 rust2rpm.toml                   |  2 ++
 sources                         |  2 +-
 6 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100644 rust2rpm.conf
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index 2a8fe40..03530ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /build-fs-tree-0.3.1.crate
+/build-fs-tree-0.6.0.crate
diff --git a/build-fs-tree-fix-metadata.diff b/build-fs-tree-fix-metadata.diff
index 0c72c8d..e8ba93c 100644
--- a/build-fs-tree-fix-metadata.diff
+++ b/build-fs-tree-fix-metadata.diff
@@ -1,6 +1,6 @@
---- build-fs-tree-0.3.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ build-fs-tree-0.3.1/Cargo.toml	2023-02-28T16:52:13.091863+00:00
-@@ -29,17 +29,6 @@
+--- build-fs-tree-0.6.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ build-fs-tree-0.6.0/Cargo.toml	2024-01-03T21:44:29.816098+00:00
+@@ -46,18 +46,6 @@
  path = "lib.rs"
  doc = true
  
@@ -15,6 +15,7 @@
 -path = "_cli/build-fs-tree-completions.rs"
 -doc = false
 -required-features = ["cli-completions"]
- [dependencies.derive_more]
- version = "^0.99.17"
- 
+-
+ [dependencies.clap]
+ version = "^4.0.32"
+ optional = true
diff --git a/rust-build-fs-tree.spec b/rust-build-fs-tree.spec
index 718bb80..a867c2d 100644
--- a/rust-build-fs-tree.spec
+++ b/rust-build-fs-tree.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate build-fs-tree
 
 Name:           rust-build-fs-tree
-Version:        0.3.1
+Version:        0.6.0
 Release:        %autorelease
 Summary:        Generate a filesystem tree from a macro or a YAML tree
 
@@ -15,7 +15,7 @@ Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 Patch:          build-fs-tree-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Generate a filesystem tree from a macro or a YAML tree.}
@@ -48,8 +48,20 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+clap-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+clap-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "clap" feature of the "%{crate}" crate.
+
+%files       -n %{name}+clap-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index 346b968..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-unwanted-features =
-  cli
-  cli-completions
-  structopt
-  structopt-utilities
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..7347cb7
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,2 @@
+[features]
+hide = ["clap-utilities", "cli", "cli-completions"]
diff --git a/sources b/sources
index 9d8fd90..0c4325d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (build-fs-tree-0.3.1.crate) = 8f6c4b8d306d7fa27b74d6b68efc71fa4576ebcba0315084ef25ba949a669bd5e1072e94bed5275bcfa9d268099f90ab6ccd192c87fc8432f3a2dc2f729eecaf
+SHA512 (build-fs-tree-0.6.0.crate) = 906403ad6914bc92f7434597f82b9fa3625044ca79abca651367511a5d94fae55621c9ed6df1b8405ae09c91a0f7d7f4d82dd772c9544d595a457acaac1c06b5