From b9ed44dc8454fc8823000cdc582632b7b23712a7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jul 16 2022 10:11:00 +0000 Subject: Update to version 2.1.0; Fixes RHBZ#2107775 --- diff --git a/.gitignore b/.gitignore index 12ef8a5..b03f786 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /log-panics-2.0.0.crate +/log-panics-2.1.0.crate diff --git a/log-panics-bump-env-logger.diff b/log-panics-bump-env-logger.diff deleted file mode 100644 index 9b95b9b..0000000 --- a/log-panics-bump-env-logger.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru log-panics-2.0.0.orig/Cargo.toml log-panics-2.0.0/Cargo.toml ---- log-panics-2.0.0.orig/Cargo.toml 1969-12-31 16:00:00.000000000 -0800 -+++ log-panics-2.0.0/Cargo.toml 2020-06-28 09:48:34.376298786 -0700 -@@ -25,7 +25,7 @@ - [dependencies.log] - version = "0.4" - [dev-dependencies.env_logger] --version = "0.3" -+version = "0.7" - - [features] - with-backtrace = ["backtrace"] -diff -ru log-panics-2.0.0.orig/examples/panic.rs log-panics-2.0.0/examples/panic.rs ---- log-panics-2.0.0.orig/examples/panic.rs 2017-08-04 22:32:20.000000000 -0700 -+++ log-panics-2.0.0/examples/panic.rs 2020-06-28 09:48:02.188490036 -0700 -@@ -2,7 +2,7 @@ - extern crate env_logger; - - fn main() { -- env_logger::init().unwrap(); -+ env_logger::init(); - log_panics::init(); - - foo(); diff --git a/rust-log-panics.spec b/rust-log-panics.spec index 3e6cd01..5152f7a 100644 --- a/rust-log-panics.spec +++ b/rust-log-panics.spec @@ -1,13 +1,11 @@ -# Generated by rust2rpm 13 - +# Generated by rust2rpm 21 %bcond_without check - %global debug_package %{nil} %global crate log-panics Name: rust-%{crate} -Version: 2.0.0 +Version: 2.1.0 Release: %autorelease Summary: Panic hook which logs panic messages rather than printing them @@ -15,18 +13,10 @@ Summary: Panic hook which logs panic messages rather than printing them License: MIT or ASL 2.0 URL: https://crates.io/crates/log-panics Source: %{crates_source} -# Use env-logger 0.7 -# https://github.com/sfackler/rust-log-panics/pull/6 -# also backport post-release commit -# for env-logger >= 0.5 compatibility -Patch0: log-panics-bump-env-logger.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Panic hook which logs panic messages rather than printing them.} @@ -39,13 +29,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 LICENSE-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -53,11 +44,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 %package -n %{name}+backtrace-devel Summary: %{summary} @@ -65,11 +56,11 @@ BuildArch: noarch %description -n %{name}+backtrace-devel %{_description} -This package contains library source intended for building other packages -which use "backtrace" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "backtrace" feature of the "%{crate}" crate. %files -n %{name}+backtrace-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+with-backtrace-devel Summary: %{summary} @@ -77,11 +68,11 @@ BuildArch: noarch %description -n %{name}+with-backtrace-devel %{_description} -This package contains library source intended for building other packages -which use "with-backtrace" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "with-backtrace" feature of the "%{crate}" crate. %files -n %{name}+with-backtrace-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 bdf666e..fefbce5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (log-panics-2.0.0.crate) = bfc4c51d85c4164ae5cda5d0b4b8ed738faf3ed77ff6558a1dfa3c0ef5e082f01ff44e577d0ae287d53548d5939479b6fee0e341aa62a75b58b15071489d9191 +SHA512 (log-panics-2.1.0.crate) = c77d305918aa5d495f69e409d7daf5985cbb8270befc2d680d04d015ce02ea15fa8fe08e2ec5b469ad4ae5f5202c570f9b7bb1b94f5c12b34946830dab622629