diff --git a/.gitignore b/.gitignore index 4e4779b..69a3ee6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /config-0.9.1.crate /config-0.9.2.crate /config-0.9.3.crate +/config-0.10.1.crate diff --git a/config-fix-metadata.diff b/config-fix-metadata.diff index ebe35e6..669a9fc 100644 --- a/config-fix-metadata.diff +++ b/config-fix-metadata.diff @@ -1,23 +1,18 @@ ---- config-0.9.2/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ config-0.9.2/Cargo.toml 2019-01-07T16:02:26.593040-08:00 -@@ -34,10 +34,6 @@ - [dependencies.serde] - version = "1.0.8" +--- config-0.10.1/Cargo.toml 2019-12-08T02:22:44+00:00 ++++ config-0.10.1/Cargo.toml 2020-02-23T09:54:25.890349+00:00 +@@ -54,13 +54,13 @@ + features = ["serde"] + + [dev-dependencies.float-cmp] +-version = "0.4" ++version = "0.6" --[dependencies.serde-hjson] --version = "0.8.2" --optional = true -- - [dependencies.serde_json] - version = "1.0.2" - optional = true -@@ -60,8 +56,7 @@ + [dev-dependencies.serde_derive] version = "1.0.8" [features] -default = ["toml", "json", "yaml", "hjson", "ini"] --hjson = ["serde-hjson"] +default = ["toml", "json", "yaml", "ini"] + hjson = ["serde-hjson"] ini = ["rust-ini"] json = ["serde_json"] - yaml = ["yaml-rust"] diff --git a/rust-config.spec b/rust-config.spec index 45c85c8..b603148 100644 --- a/rust-config.spec +++ b/rust-config.spec @@ -1,13 +1,12 @@ -# Generated by rust2rpm-9-1.fc30 -# * Tests are run in infrastructure -%bcond_with check +# Generated by rust2rpm 13 +%bcond_without check %global debug_package %{nil} %global crate config Name: rust-%{crate} -Version: 0.9.3 -Release: 3%{?dist} +Version: 0.10.1 +Release: 1%{?dist} Summary: Layered configuration system for Rust applications # Upstream license specification: MIT/Apache-2.0 @@ -15,28 +14,19 @@ License: MIT or ASL 2.0 URL: https://crates.io/crates/config Source: %{crates_source} # Initial patched metadata -# * No hjson support, that crate is outdated +# * serde-hjson is not packaged, so remove from default features +# * Update float-cmp to 0.6, https://github.com/mehcode/config-rs/pull/131 Patch0: config-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) -BuildRequires: (crate(nom/default) >= 4.0.0 with crate(nom/default) < 5.0.0) -BuildRequires: (crate(rust-ini/default) >= 0.13.0 with crate(rust-ini/default) < 0.14.0) -BuildRequires: (crate(serde/default) >= 1.0.8 with crate(serde/default) < 2.0.0) -BuildRequires: (crate(serde_json/default) >= 1.0.2 with crate(serde_json/default) < 2.0.0) -BuildRequires: (crate(toml/default) >= 0.4.1 with crate(toml/default) < 0.5.0) -BuildRequires: (crate(yaml-rust/default) >= 0.4.0 with crate(yaml-rust/default) < 0.5.0) -%if %{with check} -BuildRequires: (crate(chrono/default) >= 0.4.0 with crate(chrono/default) < 0.5.0) -BuildRequires: (crate(chrono/serde) >= 0.4.0 with crate(chrono/serde) < 0.5.0) -BuildRequires: (crate(float-cmp/default) >= 0.4.0 with crate(float-cmp/default) < 0.5.0) -BuildRequires: (crate(serde_derive/default) >= 1.0.8 with crate(serde_derive/default) < 2.0.0) -%endif -%global _description \ -Layered configuration system for Rust applications. +%global _description %{expand: +Layered configuration system for Rust applications.} %description %{_description} @@ -52,7 +42,7 @@ which use "%{crate}" crate. %files devel %license LICENSE-MIT LICENSE-APACHE %doc README.md CHANGELOG.md -%{cargo_registry}/%{crate}-%{version}/ +%{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel Summary: %{summary} @@ -64,7 +54,19 @@ This package contains library source intended for building other packages which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+hjson-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+hjson-devel %{_description} + +This package contains library source intended for building other packages +which use "hjson" feature of "%{crate}" crate. + +%files -n %{name}+hjson-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+ini-devel Summary: %{summary} @@ -76,7 +78,7 @@ This package contains library source intended for building other packages which use "ini" feature of "%{crate}" crate. %files -n %{name}+ini-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+json-devel Summary: %{summary} @@ -88,7 +90,7 @@ This package contains library source intended for building other packages which use "json" feature of "%{crate}" crate. %files -n %{name}+json-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+rust-ini-devel Summary: %{summary} @@ -100,7 +102,19 @@ This package contains library source intended for building other packages which use "rust-ini" feature of "%{crate}" crate. %files -n %{name}+rust-ini-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+serde-hjson-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-hjson-devel %{_description} + +This package contains library source intended for building other packages +which use "serde-hjson" feature of "%{crate}" crate. + +%files -n %{name}+serde-hjson-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+serde_json-devel Summary: %{summary} @@ -112,7 +126,7 @@ This package contains library source intended for building other packages which use "serde_json" feature of "%{crate}" crate. %files -n %{name}+serde_json-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+toml-devel Summary: %{summary} @@ -124,7 +138,7 @@ This package contains library source intended for building other packages which use "toml" feature of "%{crate}" crate. %files -n %{name}+toml-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+yaml-devel Summary: %{summary} @@ -136,7 +150,7 @@ This package contains library source intended for building other packages which use "yaml" feature of "%{crate}" crate. %files -n %{name}+yaml-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+yaml-rust-devel Summary: %{summary} @@ -148,12 +162,15 @@ This package contains library source intended for building other packages which use "yaml-rust" feature of "%{crate}" crate. %files -n %{name}+yaml-rust-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires + %build %cargo_build @@ -166,6 +183,9 @@ which use "yaml-rust" feature of "%{crate}" crate. %endif %changelog +* Sun Feb 23 10:48:06 CET 2020 Igor Raits - 0.10.1-1 +- Update to 0.10.1 + * Thu Jan 30 2020 Fedora Release Engineering - 0.9.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 61acf11..9c67c99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (config-0.9.3.crate) = 60241f9d553d7715130d686177f0a8f6000018def99b7c6acc38e1fa0c55374f97a77900cff6359567d89622a12050a6f7aefafde034b913666b143d4e6d7494 +SHA512 (config-0.10.1.crate) = 912a5b7632a6a9ae8cbf3760e12c9c876b46e3cae7e5f27d733e38587b1eeb10ca4c66657855f500ad450ca725581518176caed8a8c608bdbe37cff7de843ba5