From 1ecbf272cb30fa38466f7706d1421e381b940a86 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Feb 14 2024 15:59:53 +0000 Subject: Update to version 0.6.12; Fixes RHBZ#2263949 --- diff --git a/.gitignore b/.gitignore index 517582e..f534014 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /eyre-0.6.8.crate +/eyre-0.6.12.crate diff --git a/eyre-fix-metadata.diff b/eyre-fix-metadata.diff index 1cb96c8..9bad662 100644 --- a/eyre-fix-metadata.diff +++ b/eyre-fix-metadata.diff @@ -1,24 +1,25 @@ ---- eyre-0.6.8/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ eyre-0.6.8/Cargo.toml 2023-04-20T19:05:23.324498+00:00 -@@ -66,10 +66,6 @@ +--- eyre-0.6.12/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ eyre-0.6.12/Cargo.toml 2024-02-14T15:54:41.554088+00:00 +@@ -41,11 +41,6 @@ [dependencies.once_cell] - version = "1.4.0" + version = "1.18.0" -[dependencies.pyo3] --version = "0.13" +-version = "0.20" -optional = true -default-features = false +- [dev-dependencies.anyhow] version = "1.0.28" -@@ -78,11 +74,6 @@ +@@ -54,11 +49,6 @@ [dev-dependencies.futures] version = "0.3" -default-features = false - -[dev-dependencies.pyo3] --version = "0.13" +-version = "0.20" -features = ["auto-initialize"] default-features = false diff --git a/rust-eyre.spec b/rust-eyre.spec index 12bb232..4065586 100644 --- a/rust-eyre.spec +++ b/rust-eyre.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate eyre Name: rust-eyre -Version: 0.6.8 +Version: 0.6.12 Release: %autorelease Summary: Flexible concrete Error Reporting type with customizable Reports @@ -13,10 +13,10 @@ License: MIT OR Apache-2.0 URL: https://crates.io/crates/eyre Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * drop optional pyo3 dependencies (version does not match what is in Fedora) +# * drop optional support for PyO3 Patch: eyre-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Flexible concrete Error Reporting type built on std::error::Error with @@ -77,7 +77,7 @@ use the "track-caller" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -91,9 +91,7 @@ use the "track-caller" feature of the "%{crate}" crate. %if %{with check} %check -# * some doctests fail to compile with thiserror 1.0.40: -# https://github.com/yaahc/eyre/issues/94 -%cargo_test -- -- --skip "src/macros.rs" +%cargo_test %endif %changelog diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..d8d0eb0 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,3 @@ +[package] +summary = "Flexible concrete Error Reporting type with customizable Reports" + diff --git a/sources b/sources index 97bfcb1..679b533 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (eyre-0.6.8.crate) = 0a54e2ce9d58e80596ab7d55f0f913fe3d9bad6cdc5f56b9aa4683732e2d409e288a579e89b300e35a822f56017524b2ebbc0e60860b9dd6e479080f7cb14324 +SHA512 (eyre-0.6.12.crate) = 6d5e3bcc138189e958693dda0c2300c6a30567f60f65432c4f24e41a3def7431366e45de62f74f21485d678daf831e77ab04ba80346c57cffb694a179380e769