From 2a310009c530c51d9fa1f4f73addce7fabb01b9a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 15 Dec 2021 14:33:18 +0100 Subject: [PATCH] Update to version 1.16.0; Fixes RHBZ#2026721 --- .gitignore | 1 + rust-simple_logger.spec | 77 +++++++++++++++++++++------------ simple_logger-fix-metadata.diff | 10 ++--- sources | 2 +- 4 files changed, 56 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 5049173..c2d49a7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /simple_logger-1.11.0.crate /simple_logger-1.12.1.crate /simple_logger-1.13.0.crate +/simple_logger-1.16.0.crate diff --git a/rust-simple_logger.spec b/rust-simple_logger.spec index 82dd033..1427bfc 100644 --- a/rust-simple_logger.spec +++ b/rust-simple_logger.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate simple_logger Name: rust-%{crate} -Version: 1.13.0 +Version: 1.16.0 Release: %autorelease Summary: Logger that prints all messages with a readable output format @@ -18,9 +18,6 @@ Source: %{crates_source} Patch0: simple_logger-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -35,8 +32,8 @@ 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 @@ -49,46 +46,46 @@ 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 -%package -n %{name}+chrono-devel +%package -n %{name}+colored-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+chrono-devel %{_description} +%description -n %{name}+colored-devel %{_description} -This package contains library source intended for building other packages -which use "chrono" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "colored" feature of the "%{crate}" crate. -%files -n %{name}+chrono-devel +%files -n %{name}+colored-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+colored-devel +%package -n %{name}+colors-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+colored-devel %{_description} +%description -n %{name}+colors-devel %{_description} -This package contains library source intended for building other packages -which use "colored" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "colors" feature of the "%{crate}" crate. -%files -n %{name}+colored-devel +%files -n %{name}+colors-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+colors-devel +%package -n %{name}+nightly-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+colors-devel %{_description} +%description -n %{name}+nightly-devel %{_description} -This package contains library source intended for building other packages -which use "colors" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "nightly" feature of the "%{crate}" crate. -%files -n %{name}+colors-devel +%files -n %{name}+nightly-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+stderr-devel @@ -97,20 +94,44 @@ BuildArch: noarch %description -n %{name}+stderr-devel %{_description} -This package contains library source intended for building other packages -which use "stderr" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "stderr" feature of the "%{crate}" crate. %files -n %{name}+stderr-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+threads-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+threads-devel %{_description} + +This package contains library source intended for building other packages which +use the "threads" feature of the "%{crate}" crate. + +%files -n %{name}+threads-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+time-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+time-devel %{_description} + +This package contains library source intended for building other packages which +use the "time" feature of the "%{crate}" crate. + +%files -n %{name}+time-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+timestamps-devel Summary: %{summary} BuildArch: noarch %description -n %{name}+timestamps-devel %{_description} -This package contains library source intended for building other packages -which use "timestamps" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "timestamps" feature of the "%{crate}" crate. %files -n %{name}+timestamps-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/simple_logger-fix-metadata.diff b/simple_logger-fix-metadata.diff index fef5500..bd01b41 100644 --- a/simple_logger-fix-metadata.diff +++ b/simple_logger-fix-metadata.diff @@ -1,9 +1,9 @@ ---- simple_logger-1.13.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ simple_logger-1.13.0/Cargo.toml 2021-08-08T11:44:03.518667+00:00 -@@ -43,9 +43,3 @@ - default = ["colored", "chrono"] +--- simple_logger-1.16.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ simple_logger-1.16.0/Cargo.toml 2021-12-15T13:31:41.048500+00:00 +@@ -53,9 +53,3 @@ stderr = [] - timestamps = ["chrono"] + threads = [] + timestamps = ["time"] -[target."cfg(windows)".dependencies.atty] -version = "0.2.13" - diff --git a/sources b/sources index 5805647..8c5829e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (simple_logger-1.13.0.crate) = f6dbb74a5d25895189092e567784daca9e0b4cb48a527a400b4c2ccfeed7ffcdd3f00719e8d084f82390971567b4c280bfc3c47db2356331c0107fbaef941b8c +SHA512 (simple_logger-1.16.0.crate) = bd0636318e3c365047802d8c35cd262ed0bd0df4a2c3d2094e875c5805d982b6f337937603f597a27a3a4983c8c5f25a77a1fbb2d23692f311b0fb268f0a8f70