diff --git a/miette-fix-metadata.diff b/miette-fix-metadata.diff deleted file mode 100644 index 432dfb0..0000000 --- a/miette-fix-metadata.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- miette-5.10.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ miette-5.10.0/Cargo.toml 2023-07-17T20:39:48.696583+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] -@@ -115,11 +111,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 ade2fcf..1663cc2 100644 --- a/rust-miette.spec +++ b/rust-miette.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} @@ -12,11 +12,8 @@ Summary: Fancy diagnostic reporting library and protocol for us mere mort License: Apache-2.0 URL: https://crates.io/crates/miette Source: %{crates_source} -# 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 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Fancy diagnostic reporting library and protocol for us mere mortals who @@ -65,6 +62,30 @@ use the "backtrace" feature of the "%{crate}" crate. %files -n %{name}+backtrace-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+backtrace-ext-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+backtrace-ext-devel %{_description} + +This package contains library source intended for building other packages which +use the "backtrace-ext" feature of the "%{crate}" crate. + +%files -n %{name}+backtrace-ext-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+fancy-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+fancy-devel %{_description} + +This package contains library source intended for building other packages which +use the "fancy" feature of the "%{crate}" crate. + +%files -n %{name}+fancy-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+fancy-no-backtrace-devel Summary: %{summary} BuildArch: noarch @@ -186,7 +207,7 @@ use the "textwrap" 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 diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 679e312..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -summary = Fancy diagnostic reporting library and protocol for us mere mortals diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..045ef95 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,3 @@ +[package] +summary = "Fancy diagnostic reporting library and protocol for us mere mortals" +