diff --git a/.gitignore b/.gitignore index b5ff075..1eab99d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /log4rs-0.12.0.crate +/log4rs-1.0.0.crate diff --git a/log4rs-fix-metadata.diff b/log4rs-fix-metadata.diff index 39371a0..8460285 100644 --- a/log4rs-fix-metadata.diff +++ b/log4rs-fix-metadata.diff @@ -1,38 +1,15 @@ ---- log4rs-0.12.0/Cargo.toml 2020-05-06T00:08:47+00:00 -+++ log4rs-0.12.0/Cargo.toml 2020-09-30T13:31:43.696368+00:00 -@@ -59,7 +59,7 @@ - optional = true - - [dependencies.parking_lot] --version = "0.10.0" -+version = "0.11.0" - optional = true - - [dependencies.serde] -@@ -67,11 +67,11 @@ - optional = true - - [dependencies.serde-value] --version = "0.6" -+version = "0.7" - optional = true - - [dependencies.serde-xml-rs] --version = "0.3" -+version = "0.4" - optional = true - - [dependencies.serde_derive] -@@ -115,7 +115,7 @@ - background_rotation = [] +--- log4rs-1.0.0/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ log4rs-1.0.0/Cargo.toml 2020-12-26T11:33:06.491734+00:00 +@@ -122,7 +122,7 @@ compound_policy = [] + config_parsing = ["humantime", "serde", "serde-value", "typemap", "log/serde"] console_appender = ["console_writer", "simple_writer", "pattern_encoder"] -console_writer = ["ansi_writer", "libc", "winapi"] +console_writer = ["ansi_writer", "libc"] - default = ["all_components", "file", "yaml_format", "gzip"] + default = ["all_components", "config_parsing", "yaml_format"] delete_roller = [] - file = ["humantime", "serde", "serde_derive", "serde-value", "typemap", "log/serde"] -@@ -135,7 +135,3 @@ + file_appender = ["parking_lot", "simple_writer", "pattern_encoder", "regex"] +@@ -140,7 +140,3 @@ [target."cfg(not(windows))".dependencies.libc] version = "0.2" optional = true diff --git a/rust-log4rs.spec b/rust-log4rs.spec index 66c8c8d..66a5d45 100644 --- a/rust-log4rs.spec +++ b/rust-log4rs.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm 13 +# Generated by rust2rpm 16 %bcond_without check %global debug_package %{nil} %global crate log4rs Name: rust-%{crate} -Version: 0.12.0 -Release: 5%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Highly configurable multi-output logging implementation for the `log` facade # Upstream license specification: MIT/Apache-2.0 @@ -15,8 +15,6 @@ URL: https://crates.io/crates/log4rs Source: %{crates_source} # Initial patched metadata # * No windows -# * Bump to parking_lot 0.11, https://github.com/estk/log4rs/pull/173 -# * Bump to serde-value 0.7.0, https://github.com/estk/log4rs/commit/9a02da9 Patch0: log4rs-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -117,6 +115,18 @@ which use "compound_policy" feature of "%{crate}" crate. %files -n %{name}+compound_policy-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+config_parsing-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+config_parsing-devel %{_description} + +This package contains library source intended for building other packages +which use "config_parsing" feature of "%{crate}" crate. + +%files -n %{name}+config_parsing-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+console_appender-devel Summary: %{summary} BuildArch: noarch @@ -153,18 +163,6 @@ which use "delete_roller" feature of "%{crate}" crate. %files -n %{name}+delete_roller-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+file-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+file-devel %{_description} - -This package contains library source intended for building other packages -which use "file" feature of "%{crate}" crate. - -%files -n %{name}+file-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+file_appender-devel Summary: %{summary} BuildArch: noarch @@ -297,6 +295,18 @@ which use "pattern_encoder" feature of "%{crate}" crate. %files -n %{name}+pattern_encoder-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+regex-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+regex-devel %{_description} + +This package contains library source intended for building other packages +which use "regex" feature of "%{crate}" crate. + +%files -n %{name}+regex-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+rolling_file_appender-devel Summary: %{summary} BuildArch: noarch @@ -333,30 +343,6 @@ which use "serde-value" feature of "%{crate}" crate. %files -n %{name}+serde-value-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+serde-xml-rs-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+serde-xml-rs-devel %{_description} - -This package contains library source intended for building other packages -which use "serde-xml-rs" feature of "%{crate}" crate. - -%files -n %{name}+serde-xml-rs-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+serde_derive-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+serde_derive-devel %{_description} - -This package contains library source intended for building other packages -which use "serde_derive" feature of "%{crate}" crate. - -%files -n %{name}+serde_derive-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+serde_json-devel Summary: %{summary} BuildArch: noarch @@ -465,18 +451,6 @@ which use "typemap" feature of "%{crate}" crate. %files -n %{name}+typemap-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+xml_format-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+xml_format-devel %{_description} - -This package contains library source intended for building other packages -which use "xml_format" feature of "%{crate}" crate. - -%files -n %{name}+xml_format-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+yaml_format-devel Summary: %{summary} BuildArch: noarch @@ -508,6 +482,9 @@ which use "yaml_format" feature of "%{crate}" crate. %endif %changelog +* Sat Dec 26 12:33:06 CET 2020 Igor Raits - 1.0.0-1 +- Update to 1.0.0 + * Wed Sep 30 2020 Fabio Valentini - 0.12.0-5 - Bump to serde-value 0.7.0. diff --git a/sources b/sources index f937011..4655a23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (log4rs-0.12.0.crate) = 39a8d32e93187777d0b4e11a441671f2069fe8b22a389055340c19ea4df02b837e584800ce594ec3c248df78c8305bea0fbae111184e577e39dc1386fc8eba29 +SHA512 (log4rs-1.0.0.crate) = e4b1bf26c07cc976ffab818b27a357786fa9dde7aa08fe0574dc7d0ca0b775e2770716f7a66747098114dd3b423aacf6c5dbeef7b200e635ff73342bf5667648