From d97cb9168073829170b5305bef9dceeae768cecd Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sat, 1 Apr 2023 18:47:57 +0200
Subject: [PATCH] Update to version 5.7.0; Fixes RHBZ#2177963

---
 .gitignore                        |  1 +
 README.md                         |  3 ---
 miette-fix-handleropts-test.patch | 11 --------
 miette-fix-metadata.diff          | 25 ++++++++++++++++++
 rust-miette.spec                  | 43 ++++++++++++-------------------
 sources                           |  2 +-
 6 files changed, 43 insertions(+), 42 deletions(-)
 delete mode 100644 README.md
 delete mode 100644 miette-fix-handleropts-test.patch
 create mode 100644 miette-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 5118378..bcdff63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /miette-4.4.0.crate
 /miette-5.1.1.crate
 /miette-5.5.0.crate
+/miette-5.7.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 3549b3b..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-miette
-
-The rust-miette package
diff --git a/miette-fix-handleropts-test.patch b/miette-fix-handleropts-test.patch
deleted file mode 100644
index 09e65d3..0000000
--- a/miette-fix-handleropts-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- miette-5.1.1/src/lib.rs	1973-11-29 13:33:09.000000000 -0800
-+++ miette-5.1.1-fix-handleropts-tests/src/lib.rs	2022-07-25 18:55:59.356397534 -0700
-@@ -559,7 +559,7 @@
- //!
- //! Usage is like so:
- //!
--//! ```rust
-+//! ```ignore
- //! miette::set_hook(Box::new(|_| {
- //!     Box::new(
- //!         miette::MietteHandlerOpts::new()
diff --git a/miette-fix-metadata.diff b/miette-fix-metadata.diff
new file mode 100644
index 0000000..53fca67
--- /dev/null
+++ b/miette-fix-metadata.diff
@@ -0,0 +1,25 @@
+--- miette-5.7.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ miette-5.7.0/Cargo.toml	2023-04-01T16:39:08.729275+00:00
+@@ -32,10 +32,6 @@
+ 
+ [dependencies.backtrace]
+ version = "0.3.61"
+-optional = true
+-
+-[dependencies.backtrace-ext]
+-version = "0.2.1"
+ optional = true
+ 
+ [dependencies.is-terminal]
+@@ -107,11 +103,6 @@
+ 
+ [features]
+ default = []
+-fancy = [
+-    "fancy-no-backtrace",
+-    "backtrace",
+-    "backtrace-ext",
+-]
+ fancy-no-backtrace = [
+     "owo-colors",
+     "is-terminal",
diff --git a/rust-miette.spec b/rust-miette.spec
index a9e2060..d16fa9d 100644
--- a/rust-miette.spec
+++ b/rust-miette.spec
@@ -1,25 +1,26 @@
-# Generated by rust2rpm 23
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate miette
 
 Name:           rust-miette
-Version:        5.5.0
+Version:        5.7.0
 Release:        %autorelease
-Summary:        Fancy diagnostic reporting library and protocol for us mere mortals who aren't compiler hackers
+Summary:        Fancy diagnostic reporting library and protocol for us mere mortals
 
 License:        Apache-2.0
 URL:            https://crates.io/crates/miette
 Source:         %{crates_source}
-# fix https://github.com/zkat/miette/issues/88
-Patch:          %{crate}-fix-handleropts-test.patch
+# Manually created patch for downstream crate metadata changes
+# * disable unused "fancy" feature with missing "backtrace-ext" dependency
+Patch:          miette-fix-metadata.diff
 
 BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
-Fancy diagnostic reporting library and protocol for us mere mortals who aren't
-compiler hackers.}
+Fancy diagnostic reporting library and protocol for us mere mortals who
+aren't compiler hackers.}
 
 %description %{_description}
 
@@ -52,18 +53,6 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+atty-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+atty-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "atty" feature of the "%{crate}" crate.
-
-%files       -n %{name}+atty-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+backtrace-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -76,28 +65,28 @@ use the "backtrace" feature of the "%{crate}" crate.
 %files       -n %{name}+backtrace-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+fancy-devel
+%package     -n %{name}+fancy-no-backtrace-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+fancy-devel %{_description}
+%description -n %{name}+fancy-no-backtrace-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "fancy" feature of the "%{crate}" crate.
+use the "fancy-no-backtrace" feature of the "%{crate}" crate.
 
-%files       -n %{name}+fancy-devel
+%files       -n %{name}+fancy-no-backtrace-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+fancy-no-backtrace-devel
+%package     -n %{name}+is-terminal-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+fancy-no-backtrace-devel %{_description}
+%description -n %{name}+is-terminal-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "fancy-no-backtrace" feature of the "%{crate}" crate.
+use the "is-terminal" feature of the "%{crate}" crate.
 
-%files       -n %{name}+fancy-no-backtrace-devel
+%files       -n %{name}+is-terminal-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+owo-colors-devel
diff --git a/sources b/sources
index e2dbfec..e1290d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (miette-5.5.0.crate) = 1d1ad87a3f78fb06e1d50a9f9e58835f8b651aa8863e8629c81184fd756aa02ca36a8b6359dff93c855d7cedbd88567e82b09c18deead7fe9941d522e2ae26dd
+SHA512 (miette-5.7.0.crate) = 9dea5d23a3986d03e284b35e3ba03fcb13a1c2dc0f9d1f8776118f7ca6a987e1949fdee3abfaa906026d7814a0989ae9c2b93a29d664110d6cdebc6afec13c9c