From 1957a40c9477a2d21452c5a8a47dac8ae917819a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 31 Dec 2023 20:53:11 +0100 Subject: [PATCH] Update to version 0.2.0; Fixes RHBZ#2246194 --- .gitignore | 1 + rust-tracing-log.spec | 28 ++-------------------------- sources | 2 +- tracing-log-fix-metadata.diff | 20 ++++++++------------ 4 files changed, 12 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index acfd20a..584f21d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /tracing-log-0.1.3.crate /tracing-log-0.1.4.crate +/tracing-log-0.2.0.crate diff --git a/rust-tracing-log.spec b/rust-tracing-log.spec index 1cea162..79ffdfd 100644 --- a/rust-tracing-log.spec +++ b/rust-tracing-log.spec @@ -5,7 +5,7 @@ %global crate tracing-log Name: rust-tracing-log -Version: 0.1.4 +Version: 0.2.0 Release: %autorelease Summary: Compatibility between tracing and the log crate @@ -14,7 +14,7 @@ URL: https://crates.io/crates/tracing-log Source: %{crates_source} # Manually created patch for downstream crate metadata changes # * drop unused, benchmark-only criterion dev-dependency -# * drop optional interest-cache feature (lru is not packaged yet) +# * drop unused, optional interest-cache feature Patch: tracing-log-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 @@ -51,18 +51,6 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+env_logger-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+env_logger-devel %{_description} - -This package contains library source intended for building other packages which -use the "env_logger" feature of the "%{crate}" crate. - -%files -n %{name}+env_logger-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+log-tracer-devel Summary: %{summary} BuildArch: noarch @@ -87,18 +75,6 @@ use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+trace-logger-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+trace-logger-devel %{_description} - -This package contains library source intended for building other packages which -use the "trace-logger" feature of the "%{crate}" crate. - -%files -n %{name}+trace-logger-devel -%ghost %{crate_instdir}/Cargo.toml - %prep %autosetup -n %{crate}-%{version} -p1 %cargo_prep diff --git a/sources b/sources index f8053b4..8814031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tracing-log-0.1.4.crate) = 0706f5351cd940639a9a910c3b50099f742ed6880a503ad3c317d4ca318c3ddb54d04790badbf4ba0d968997a1490d2f325b99a842bdad5283006eb55674a998 +SHA512 (tracing-log-0.2.0.crate) = 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285 diff --git a/tracing-log-fix-metadata.diff b/tracing-log-fix-metadata.diff index 560db96..7556d83 100644 --- a/tracing-log-fix-metadata.diff +++ b/tracing-log-fix-metadata.diff @@ -1,6 +1,6 @@ ---- tracing-log-0.1.4/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ tracing-log-0.1.4/Cargo.toml 2023-10-23T23:06:34.166925+00:00 -@@ -39,14 +39,6 @@ +--- tracing-log-0.2.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ tracing-log-0.2.0/Cargo.toml 2023-12-28T17:00:25.954897+00:00 +@@ -39,30 +39,14 @@ "docsrs", ] @@ -12,17 +12,13 @@ -version = "0.7.6" -optional = true - - [dependencies.env_logger] - version = "0.8.4" - optional = true -@@ -54,19 +46,11 @@ [dependencies.log] version = "0.4.17" - +- -[dependencies.lru] -version = "0.7.7" -optional = true -- + [dependencies.once_cell] version = "1.13.0" @@ -35,8 +31,8 @@ [dev-dependencies.tracing] version = "0.1.35" -@@ -77,10 +61,6 @@ - "trace-logger", +@@ -72,10 +56,6 @@ + "log-tracer", "std", ] -interest-cache = [ @@ -45,4 +41,4 @@ -] log-tracer = [] std = ["log/std"] - trace-logger = [] +