From 8d8cf03994983474c98dace0c87b2606643157dd Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 17 Apr 2023 16:19:50 +0200
Subject: [PATCH] Update to version 0.1.7; Fixes RHBZ#2158499

---
 .gitignore                      |  1 +
 README.md                       |  3 ---
 grep-cli-fix-metadata-auto.diff |  8 +++++++
 grep-cli-fix-metadata.diff      |  8 -------
 rust-grep-cli.spec              | 38 ++++++++++++++-------------------
 sources                         |  2 +-
 6 files changed, 26 insertions(+), 34 deletions(-)
 delete mode 100644 README.md
 create mode 100644 grep-cli-fix-metadata-auto.diff
 delete mode 100644 grep-cli-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 57157f6..0d7598f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /grep-cli-0.1.4.crate
 /grep-cli-0.1.5.crate
 /grep-cli-0.1.6.crate
+/grep-cli-0.1.7.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index d70f239..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-grep-cli
-
-The rust-grep-cli package
\ No newline at end of file
diff --git a/grep-cli-fix-metadata-auto.diff b/grep-cli-fix-metadata-auto.diff
new file mode 100644
index 0000000..7acdbce
--- /dev/null
+++ b/grep-cli-fix-metadata-auto.diff
@@ -0,0 +1,8 @@
+--- grep-cli-0.1.7/Cargo.toml	1970-01-01T00:00:01+00:00
++++ grep-cli-0.1.7/Cargo.toml	2023-04-17T14:01:01.870357+00:00
+@@ -54,5 +54,3 @@
+ [dependencies.termcolor]
+ version = "1.0.4"
+ 
+-[target."cfg(windows)".dependencies.winapi-util]
+-version = "0.1.1"
diff --git a/grep-cli-fix-metadata.diff b/grep-cli-fix-metadata.diff
deleted file mode 100644
index e830ae2..0000000
--- a/grep-cli-fix-metadata.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- grep-cli-0.1.6/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ grep-cli-0.1.6/Cargo.toml	2021-06-18T10:46:55.405106+00:00
-@@ -45,5 +45,3 @@
- 
- [dependencies.termcolor]
- version = "1.0.4"
--[target."cfg(windows)".dependencies.winapi-util]
--version = "0.1.1"
diff --git a/rust-grep-cli.spec b/rust-grep-cli.spec
index b4c3e3f..7d75965 100644
--- a/rust-grep-cli.spec
+++ b/rust-grep-cli.spec
@@ -1,28 +1,21 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate grep-cli
 
-Name:           rust-%{crate}
-Version:        0.1.6
+Name:           rust-grep-cli
+Version:        0.1.7
 Release:        %autorelease
 Summary:        Utilities for search oriented command line applications
 
-# Upstream license specification: Unlicense/MIT
-License:        Unlicense or MIT
+License:        Unlicense OR MIT
 URL:            https://crates.io/crates/grep-cli
 Source:         %{crates_source}
-# Initial patched metadata
-# * drop windows-specific dependencies
-Patch0:         grep-cli-fix-metadata.diff
+# Automatically generated patch to strip foreign dependencies
+Patch:          grep-cli-fix-metadata-auto.diff
 
-ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
-
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Utilities for search oriented command line applications.}
@@ -35,13 +28,14 @@ BuildArch:      noarch
 
 %description    devel %{_description}
 
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
 
 %files          devel
-%license UNLICENSE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-MIT
+%license %{crate_instdir}/UNLICENSE
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -49,11 +43,11 @@ BuildArch:      noarch
 
 %description -n %{name}+default-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
 
 %files       -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 9af43c8..6b1a093 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (grep-cli-0.1.6.crate) = ffacb90586bb28afc3ab2a780be10c78f32b83c5ef5b28c7729ed61353ff5197bdafa485e87371d5ea10198bc9c28c46a22172a9fdb0adad0119274c503214ab
+SHA512 (grep-cli-0.1.7.crate) = 3465bc8831c7e67158640fb2d8b98673f6623591a7075546eeeaafe4dd39ae22d2241143e08cdf3409b8782fcff872655a5fc94d687d9176ff11118c42a92252