The package rpms/rust-config.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-config.git/commit/?id=961302...
https://src.fedoraproject.org/cgit/rpms/rust-config.git/commit/?id=1777cd...
https://src.fedoraproject.org/cgit/rpms/rust-config.git/commit/?id=8474b5....
Change:
+ExclusiveArch: %{rust_arches}
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 8694f91c8d16d14562018bb454fac27170250f76
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sun Oct 23 13:43:05 2022 +0100
Use 0.12.0 as that what other deps allow us to use ATM
diff --git a/.gitignore b/.gitignore
index 69a3ee6..cc03f3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/config-0.9.0.crate
-/config-0.9.1.crate
-/config-0.9.2.crate
-/config-0.9.3.crate
-/config-0.10.1.crate
+/config-0.*.crate
diff --git a/00-port-to-ini-0.15.patch b/00-port-to-ini-0.15.patch
deleted file mode 100644
index cbbc1dd..0000000
--- a/00-port-to-ini-0.15.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/file/format/ini.rs b/src/file/format/ini.rs
-index e5e5950..b463560 100644
---- a/src/file/format/ini.rs
-+++ b/src/file/format/ini.rs
-@@ -11,25 +11,25 @@ pub fn parse(
- let mut map: HashMap<String, Value> = HashMap::new();
- let i = Ini::load_from_str(text)?;
- for (sec, prop) in i.iter() {
-- match *sec {
-- Some(ref sec) => {
-+ match sec {
-+ Some(sec) => {
- let mut sec_map: HashMap<String, Value> = HashMap::new();
- for (k, v) in prop.iter() {
- sec_map.insert(
-- k.clone(),
-- Value::new(uri, ValueKind::String(v.clone())),
-+ k.to_owned(),
-+ Value::new(uri, ValueKind::String(v.to_owned())),
- );
- }
- map.insert(
-- sec.clone(),
-+ sec.to_owned(),
- Value::new(uri, ValueKind::Table(sec_map)),
- );
- }
- None => {
- for (k, v) in prop.iter() {
- map.insert(
-- k.clone(),
-- Value::new(uri, ValueKind::String(v.clone())),
-+ k.to_owned(),
-+ Value::new(uri, ValueKind::String(v.to_owned())),
- );
- }
- }
-diff --git a/tests/file_ini.rs b/tests/file_ini.rs
-index 0b7b6a0..844beea 100644
---- a/tests/file_ini.rs
-+++ b/tests/file_ini.rs
-@@ -63,6 +63,6 @@ fn test_error_parse() {
- assert!(res.is_err());
- assert_eq!(
- res.unwrap_err().to_string(),
-- r#"2:0 Expecting "[Some('='), Some(':')]" but
found EOF. in tests/Settings-invalid.ini"#
-+ r#"2:0 expecting "[Some('='), Some(':')]" but
found EOF. in tests/Settings-invalid.ini"#
- );
- }
diff --git a/01-adapt-toml-error-message.patch b/01-adapt-toml-error-message.patch
deleted file mode 100644
index 6482c96..0000000
--- a/01-adapt-toml-error-message.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/errors.rs b/tests/errors.rs
-index 5f4a1a5..027097e 100644
---- a/tests/errors.rs
-+++ b/tests/errors.rs
-@@ -23,7 +23,7 @@ fn test_error_parse() {
- assert!(res.is_err());
- assert_eq!(
- res.unwrap_err().to_string(),
-- "failed to parse datetime for key `error` at line 2 column 9 in
tests/Settings-invalid.toml".to_string()
-+ "invalid TOML value, did you mean to use a quoted string? at line 2 column
9 in tests/Settings-invalid.toml".to_string()
- );
- }
-
-diff --git a/tests/file_toml.rs b/tests/file_toml.rs
-index d1ae5db..bb7aa23 100644
---- a/tests/file_toml.rs
-+++ b/tests/file_toml.rs
-@@ -82,6 +82,6 @@ fn test_error_parse() {
- assert!(res.is_err());
- assert_eq!(
- res.unwrap_err().to_string(),
-- "failed to parse datetime for key `error` at line 2 column 9 in
tests/Settings-invalid.toml".to_string()
-+ "invalid TOML value, did you mean to use a quoted string? at line 2 column
9 in tests/Settings-invalid.toml".to_string()
- );
- }
diff --git a/config-fix-metadata.diff b/config-fix-metadata.diff
index d48e4d2..30723a9 100644
--- a/config-fix-metadata.diff
+++ b/config-fix-metadata.diff
@@ -1,36 +1,20 @@
---- config-0.10.1/Cargo.toml 2019-12-08T02:22:44+00:00
-+++ config-0.10.1/Cargo.toml 2021-05-27T19:20:34.984539+00:00
-@@ -28,15 +28,11 @@
- version = "5.0.0"
+--- config-0.12.0/Cargo.toml.orig 1970-01-01 01:00:01.000000000 +0100
++++ config-0.12.0/Cargo.toml 2022-10-23 13:22:24.450372958 +0100
+@@ -85,7 +85,7 @@
+ version = "^4.0.0"
- [dependencies.rust-ini]
--version = "0.13"
-+version = "0.17"
- optional = true
+ [dev-dependencies.reqwest]
+-version = "=0.11.9"
++version = "0.11.9"
- [dependencies.serde]
- version = "1.0.8"
--
--[dependencies.serde-hjson]
--version = "0.9"
--optional = true
+ [dev-dependencies.serde]
+ version = "1.0"
+@@ -98,7 +98,7 @@
+ features = ["rt-multi-thread", "macros", "fs",
"io-util", "time"]
- [dependencies.serde_json]
- version = "1.0.2"
-@@ -54,14 +50,13 @@
- features = ["serde"]
-
- [dev-dependencies.float-cmp]
--version = "0.4"
-+version = "0.6"
-
- [dev-dependencies.serde_derive]
- version = "1.0.8"
+ [dev-dependencies.warp]
+-version = "=0.3.1"
++version = "0.3.1"
[features]
--default = ["toml", "json", "yaml", "hjson",
"ini"]
--hjson = ["serde-hjson"]
-+default = ["toml", "json", "yaml", "ini"]
- ini = ["rust-ini"]
- json = ["serde_json"]
- yaml = ["yaml-rust"]
+ default = ["toml", "json", "yaml", "ini",
"ron", "json5"]
diff --git a/rust-config.spec b/rust-config.spec
index 9093245..1898e22 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -1,11 +1,11 @@
# Generated by rust2rpm 22
-%bcond_without check
+%bcond_with check
%global debug_package %{nil}
%global crate config
Name: rust-config
-Version: 0.13.2
+Version: 0.12.0
Release: 1%{?dist}
Summary: Layered configuration system for Rust applications
@@ -13,6 +13,8 @@ Summary: Layered configuration system for Rust applications
License: MIT OR Apache-2.0
URL:
https://crates.io/crates/config
Source: %{crates_source}
+# adjust hard deps of reqwest/warp to allow slightly newer minor revs
+Patch0: config-fix-metadata.diff
ExclusiveArch: %{rust_arches}
@@ -214,5 +216,5 @@ use the "yaml-rust" feature of the "%{crate}"
crate.
%endif
%changelog
-* Fri Oct 21 2022 Peter Robinson <pbrobinson(a)fedoraproject.org> - 0.13.2-1
+* Fri Oct 21 2022 Peter Robinson <pbrobinson(a)fedoraproject.org> - 0.12.0-1
- Initial package
diff --git a/sources b/sources
index 9c67c99..da0d4a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (config-0.10.1.crate) =
912a5b7632a6a9ae8cbf3760e12c9c876b46e3cae7e5f27d733e38587b1eeb10ca4c66657855f500ad450ca725581518176caed8a8c608bdbe37cff7de843ba5
+SHA512 (config-0.12.0.crate) =
37ea281f2a21855a0c0cc6466d47b8615b7f317cb21a700ad4dd02dcccd27c4b56c6cc6907ec645e2b49678800dae8eabfbab6a1ce4afc8cdd15bf3ed8cc46fd
commit 12a3a42f5d6df621f3d2035cdc64b22fb3f8e07b
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Fri Oct 21 12:07:19 2022 +0100
0.13.2
diff --git a/rust-config.spec b/rust-config.spec
index a802559..9093245 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -1,35 +1,22 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 22
%bcond_without check
%global debug_package %{nil}
%global crate config
-Name: rust-%{crate}
-Version: 0.10.1
-Release: 7%{?dist}
+Name: rust-config
+Version: 0.13.2
+Release: 1%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL:
https://crates.io/crates/config
Source: %{crates_source}
-# Initial patched metadata
-# * serde-hjson is not packaged
-# * Update float-cmp to 0.6,
https://github.com/mehcode/config-rs/pull/131
-# * Update rust-ini to 0.15,
https://github.com/mehcode/config-rs/pull/152
-# * Bump rust-ini to 0.17
-Patch0: config-fix-metadata.diff
-# adapt to small API changes between rust-ini 0.13 and 0.15
-Patch1: 00-port-to-ini-0.15.patch
-# adapt to error message change in recent toml
-Patch2: 01-adapt-toml-error-message.patch
ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Layered configuration system for Rust applications.}
@@ -42,13 +29,15 @@ 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 CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -56,11 +45,23 @@ 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}+indexmap-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+indexmap-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "indexmap" feature of the "%{crate}" crate.
+
+%files -n %{name}+indexmap-devel
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+ini-devel
Summary: %{summary}
@@ -68,11 +69,11 @@ BuildArch: noarch
%description -n %{name}+ini-devel %{_description}
-This package contains library source intended for building other packages
-which use "ini" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "ini" feature of the "%{crate}" crate.
%files -n %{name}+ini-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+json-devel
Summary: %{summary}
@@ -80,11 +81,59 @@ BuildArch: noarch
%description -n %{name}+json-devel %{_description}
-This package contains library source intended for building other packages
-which use "json" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "json" feature of the "%{crate}" crate.
%files -n %{name}+json-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+json5-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+json5-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "json5" feature of the "%{crate}" crate.
+
+%files -n %{name}+json5-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+json5_rs-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+json5_rs-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "json5_rs" feature of the "%{crate}" crate.
+
+%files -n %{name}+json5_rs-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+preserve_order-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+preserve_order-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "preserve_order" feature of the "%{crate}" crate.
+
+%files -n %{name}+preserve_order-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+ron-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+ron-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "ron" feature of the "%{crate}" crate.
+
+%files -n %{name}+ron-devel
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+rust-ini-devel
Summary: %{summary}
@@ -92,11 +141,11 @@ BuildArch: noarch
%description -n %{name}+rust-ini-devel %{_description}
-This package contains library source intended for building other packages
-which use "rust-ini" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "rust-ini" feature of the "%{crate}" crate.
%files -n %{name}+rust-ini-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde_json-devel
Summary: %{summary}
@@ -104,11 +153,11 @@ BuildArch: noarch
%description -n %{name}+serde_json-devel %{_description}
-This package contains library source intended for building other packages
-which use "serde_json" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "serde_json" feature of the "%{crate}" crate.
%files -n %{name}+serde_json-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+toml-devel
Summary: %{summary}
@@ -116,11 +165,11 @@ BuildArch: noarch
%description -n %{name}+toml-devel %{_description}
-This package contains library source intended for building other packages
-which use "toml" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "toml" feature of the "%{crate}" crate.
%files -n %{name}+toml-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+yaml-devel
Summary: %{summary}
@@ -128,11 +177,11 @@ BuildArch: noarch
%description -n %{name}+yaml-devel %{_description}
-This package contains library source intended for building other packages
-which use "yaml" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "yaml" feature of the "%{crate}" crate.
%files -n %{name}+yaml-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+yaml-rust-devel
Summary: %{summary}
@@ -140,11 +189,11 @@ BuildArch: noarch
%description -n %{name}+yaml-rust-devel %{_description}
-This package contains library source intended for building other packages
-which use "yaml-rust" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "yaml-rust" feature of the "%{crate}" crate.
%files -n %{name}+yaml-rust-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
@@ -165,54 +214,5 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu May 27 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-6
-- Bump rust-ini to 0.17.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Nov 23 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-4
-- Bump rust-ini to 0.16.
-
-* Mon Sep 28 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-3
-- Bump rust-ini to 0.15.
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Feb 23 10:48:06 CET 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.10.1-1
-- Update to 0.10.1
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 09 2019 Josh Stone <jistone(a)redhat.com> - 0.9.3-1
-- Update to 0.9.3
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.2-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 08 2019 Josh Stone <jistone(a)redhat.com> - 0.9.2-1
-- Update to 0.9.2
-
-* Tue Nov 13 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-3
-- Adapt to new packaging
-
-* Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.1-2
-- Run tests in infrastructure
-- Bump rust-ini to 0.13
-
-* Thu Sep 27 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-1
-- Update to 0.9.1
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jul 06 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.0-1
+* Fri Oct 21 2022 Peter Robinson <pbrobinson(a)fedoraproject.org> - 0.13.2-1
- Initial package
commit 961302139b033583e61720b691a95c57062aeb59
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Oct 17 15:31:40 2022 +0200
Unretirement request: orion
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..69a3ee6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/config-0.9.0.crate
+/config-0.9.1.crate
+/config-0.9.2.crate
+/config-0.9.3.crate
+/config-0.10.1.crate
diff --git a/00-port-to-ini-0.15.patch b/00-port-to-ini-0.15.patch
new file mode 100644
index 0000000..cbbc1dd
--- /dev/null
+++ b/00-port-to-ini-0.15.patch
@@ -0,0 +1,49 @@
+diff --git a/src/file/format/ini.rs b/src/file/format/ini.rs
+index e5e5950..b463560 100644
+--- a/src/file/format/ini.rs
++++ b/src/file/format/ini.rs
+@@ -11,25 +11,25 @@ pub fn parse(
+ let mut map: HashMap<String, Value> = HashMap::new();
+ let i = Ini::load_from_str(text)?;
+ for (sec, prop) in i.iter() {
+- match *sec {
+- Some(ref sec) => {
++ match sec {
++ Some(sec) => {
+ let mut sec_map: HashMap<String, Value> = HashMap::new();
+ for (k, v) in prop.iter() {
+ sec_map.insert(
+- k.clone(),
+- Value::new(uri, ValueKind::String(v.clone())),
++ k.to_owned(),
++ Value::new(uri, ValueKind::String(v.to_owned())),
+ );
+ }
+ map.insert(
+- sec.clone(),
++ sec.to_owned(),
+ Value::new(uri, ValueKind::Table(sec_map)),
+ );
+ }
+ None => {
+ for (k, v) in prop.iter() {
+ map.insert(
+- k.clone(),
+- Value::new(uri, ValueKind::String(v.clone())),
++ k.to_owned(),
++ Value::new(uri, ValueKind::String(v.to_owned())),
+ );
+ }
+ }
+diff --git a/tests/file_ini.rs b/tests/file_ini.rs
+index 0b7b6a0..844beea 100644
+--- a/tests/file_ini.rs
++++ b/tests/file_ini.rs
+@@ -63,6 +63,6 @@ fn test_error_parse() {
+ assert!(res.is_err());
+ assert_eq!(
+ res.unwrap_err().to_string(),
+- r#"2:0 Expecting "[Some('='), Some(':')]" but
found EOF. in tests/Settings-invalid.ini"#
++ r#"2:0 expecting "[Some('='), Some(':')]" but
found EOF. in tests/Settings-invalid.ini"#
+ );
+ }
diff --git a/01-adapt-toml-error-message.patch b/01-adapt-toml-error-message.patch
new file mode 100644
index 0000000..6482c96
--- /dev/null
+++ b/01-adapt-toml-error-message.patch
@@ -0,0 +1,25 @@
+diff --git a/tests/errors.rs b/tests/errors.rs
+index 5f4a1a5..027097e 100644
+--- a/tests/errors.rs
++++ b/tests/errors.rs
+@@ -23,7 +23,7 @@ fn test_error_parse() {
+ assert!(res.is_err());
+ assert_eq!(
+ res.unwrap_err().to_string(),
+- "failed to parse datetime for key `error` at line 2 column 9 in
tests/Settings-invalid.toml".to_string()
++ "invalid TOML value, did you mean to use a quoted string? at line 2 column
9 in tests/Settings-invalid.toml".to_string()
+ );
+ }
+
+diff --git a/tests/file_toml.rs b/tests/file_toml.rs
+index d1ae5db..bb7aa23 100644
+--- a/tests/file_toml.rs
++++ b/tests/file_toml.rs
+@@ -82,6 +82,6 @@ fn test_error_parse() {
+ assert!(res.is_err());
+ assert_eq!(
+ res.unwrap_err().to_string(),
+- "failed to parse datetime for key `error` at line 2 column 9 in
tests/Settings-invalid.toml".to_string()
++ "invalid TOML value, did you mean to use a quoted string? at line 2 column
9 in tests/Settings-invalid.toml".to_string()
+ );
+ }
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c9e5ab8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# rust-config
+
+The rust-config package
\ No newline at end of file
diff --git a/config-fix-metadata.diff b/config-fix-metadata.diff
new file mode 100644
index 0000000..d48e4d2
--- /dev/null
+++ b/config-fix-metadata.diff
@@ -0,0 +1,36 @@
+--- config-0.10.1/Cargo.toml 2019-12-08T02:22:44+00:00
++++ config-0.10.1/Cargo.toml 2021-05-27T19:20:34.984539+00:00
+@@ -28,15 +28,11 @@
+ version = "5.0.0"
+
+ [dependencies.rust-ini]
+-version = "0.13"
++version = "0.17"
+ optional = true
+
+ [dependencies.serde]
+ version = "1.0.8"
+-
+-[dependencies.serde-hjson]
+-version = "0.9"
+-optional = true
+
+ [dependencies.serde_json]
+ version = "1.0.2"
+@@ -54,14 +50,13 @@
+ features = ["serde"]
+
+ [dev-dependencies.float-cmp]
+-version = "0.4"
++version = "0.6"
+
+ [dev-dependencies.serde_derive]
+ version = "1.0.8"
+
+ [features]
+-default = ["toml", "json", "yaml", "hjson",
"ini"]
+-hjson = ["serde-hjson"]
++default = ["toml", "json", "yaml", "ini"]
+ ini = ["rust-ini"]
+ json = ["serde_json"]
+ yaml = ["yaml-rust"]
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 5ac8255..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-no longer used
diff --git a/rust-config.spec b/rust-config.spec
new file mode 100644
index 0000000..a802559
--- /dev/null
+++ b/rust-config.spec
@@ -0,0 +1,218 @@
+# Generated by rust2rpm 17
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate config
+
+Name: rust-%{crate}
+Version: 0.10.1
+Release: 7%{?dist}
+Summary: Layered configuration system for Rust applications
+
+# Upstream license specification: MIT/Apache-2.0
+License: MIT or ASL 2.0
+URL:
https://crates.io/crates/config
+Source: %{crates_source}
+# Initial patched metadata
+# * serde-hjson is not packaged
+# * Update float-cmp to 0.6,
https://github.com/mehcode/config-rs/pull/131
+# * Update rust-ini to 0.15,
https://github.com/mehcode/config-rs/pull/152
+# * Bump rust-ini to 0.17
+Patch0: config-fix-metadata.diff
+# adapt to small API changes between rust-ini 0.13 and 0.15
+Patch1: 00-port-to-ini-0.15.patch
+# adapt to error message change in recent toml
+Patch2: 01-adapt-toml-error-message.patch
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Layered configuration system for Rust applications.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md CHANGELOG.md
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+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.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+ini-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+ini-devel %{_description}
+
+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_no_tilde}/Cargo.toml
+
+%package -n %{name}+json-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+json-devel %{_description}
+
+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_no_tilde}/Cargo.toml
+
+%package -n %{name}+rust-ini-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+rust-ini-devel %{_description}
+
+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_no_tilde}/Cargo.toml
+
+%package -n %{name}+serde_json-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde_json-devel %{_description}
+
+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_no_tilde}/Cargo.toml
+
+%package -n %{name}+toml-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+toml-devel %{_description}
+
+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_no_tilde}/Cargo.toml
+
+%package -n %{name}+yaml-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+yaml-devel %{_description}
+
+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_no_tilde}/Cargo.toml
+
+%package -n %{name}+yaml-rust-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+yaml-rust-devel %{_description}
+
+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_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu May 27 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-6
+- Bump rust-ini to 0.17.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Nov 23 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-4
+- Bump rust-ini to 0.16.
+
+* Mon Sep 28 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-3
+- Bump rust-ini to 0.15.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Feb 23 10:48:06 CET 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.10.1-1
+- Update to 0.10.1
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 09 2019 Josh Stone <jistone(a)redhat.com> - 0.9.3-1
+- Update to 0.9.3
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 08 2019 Josh Stone <jistone(a)redhat.com> - 0.9.2-1
+- Update to 0.9.2
+
+* Tue Nov 13 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-3
+- Adapt to new packaging
+
+* Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.1-2
+- Run tests in infrastructure
+- Bump rust-ini to 0.13
+
+* Thu Sep 27 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-1
+- Update to 0.9.1
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jul 06 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..9c67c99
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (config-0.10.1.crate) =
912a5b7632a6a9ae8cbf3760e12c9c876b46e3cae7e5f27d733e38587b1eeb10ca4c66657855f500ad450ca725581518176caed8a8c608bdbe37cff7de843ba5
commit 1777cd333479545a29440253a2e517569907b8ae
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Nov 23 11:22:55 2021 +0100
no longer used
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 69a3ee6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/config-0.9.0.crate
-/config-0.9.1.crate
-/config-0.9.2.crate
-/config-0.9.3.crate
-/config-0.10.1.crate
diff --git a/00-port-to-ini-0.15.patch b/00-port-to-ini-0.15.patch
deleted file mode 100644
index cbbc1dd..0000000
--- a/00-port-to-ini-0.15.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/file/format/ini.rs b/src/file/format/ini.rs
-index e5e5950..b463560 100644
---- a/src/file/format/ini.rs
-+++ b/src/file/format/ini.rs
-@@ -11,25 +11,25 @@ pub fn parse(
- let mut map: HashMap<String, Value> = HashMap::new();
- let i = Ini::load_from_str(text)?;
- for (sec, prop) in i.iter() {
-- match *sec {
-- Some(ref sec) => {
-+ match sec {
-+ Some(sec) => {
- let mut sec_map: HashMap<String, Value> = HashMap::new();
- for (k, v) in prop.iter() {
- sec_map.insert(
-- k.clone(),
-- Value::new(uri, ValueKind::String(v.clone())),
-+ k.to_owned(),
-+ Value::new(uri, ValueKind::String(v.to_owned())),
- );
- }
- map.insert(
-- sec.clone(),
-+ sec.to_owned(),
- Value::new(uri, ValueKind::Table(sec_map)),
- );
- }
- None => {
- for (k, v) in prop.iter() {
- map.insert(
-- k.clone(),
-- Value::new(uri, ValueKind::String(v.clone())),
-+ k.to_owned(),
-+ Value::new(uri, ValueKind::String(v.to_owned())),
- );
- }
- }
-diff --git a/tests/file_ini.rs b/tests/file_ini.rs
-index 0b7b6a0..844beea 100644
---- a/tests/file_ini.rs
-+++ b/tests/file_ini.rs
-@@ -63,6 +63,6 @@ fn test_error_parse() {
- assert!(res.is_err());
- assert_eq!(
- res.unwrap_err().to_string(),
-- r#"2:0 Expecting "[Some('='), Some(':')]" but
found EOF. in tests/Settings-invalid.ini"#
-+ r#"2:0 expecting "[Some('='), Some(':')]" but
found EOF. in tests/Settings-invalid.ini"#
- );
- }
diff --git a/01-adapt-toml-error-message.patch b/01-adapt-toml-error-message.patch
deleted file mode 100644
index 6482c96..0000000
--- a/01-adapt-toml-error-message.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/errors.rs b/tests/errors.rs
-index 5f4a1a5..027097e 100644
---- a/tests/errors.rs
-+++ b/tests/errors.rs
-@@ -23,7 +23,7 @@ fn test_error_parse() {
- assert!(res.is_err());
- assert_eq!(
- res.unwrap_err().to_string(),
-- "failed to parse datetime for key `error` at line 2 column 9 in
tests/Settings-invalid.toml".to_string()
-+ "invalid TOML value, did you mean to use a quoted string? at line 2 column
9 in tests/Settings-invalid.toml".to_string()
- );
- }
-
-diff --git a/tests/file_toml.rs b/tests/file_toml.rs
-index d1ae5db..bb7aa23 100644
---- a/tests/file_toml.rs
-+++ b/tests/file_toml.rs
-@@ -82,6 +82,6 @@ fn test_error_parse() {
- assert!(res.is_err());
- assert_eq!(
- res.unwrap_err().to_string(),
-- "failed to parse datetime for key `error` at line 2 column 9 in
tests/Settings-invalid.toml".to_string()
-+ "invalid TOML value, did you mean to use a quoted string? at line 2 column
9 in tests/Settings-invalid.toml".to_string()
- );
- }
diff --git a/README.md b/README.md
deleted file mode 100644
index c9e5ab8..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-config
-
-The rust-config package
\ No newline at end of file
diff --git a/config-fix-metadata.diff b/config-fix-metadata.diff
deleted file mode 100644
index d48e4d2..0000000
--- a/config-fix-metadata.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- config-0.10.1/Cargo.toml 2019-12-08T02:22:44+00:00
-+++ config-0.10.1/Cargo.toml 2021-05-27T19:20:34.984539+00:00
-@@ -28,15 +28,11 @@
- version = "5.0.0"
-
- [dependencies.rust-ini]
--version = "0.13"
-+version = "0.17"
- optional = true
-
- [dependencies.serde]
- version = "1.0.8"
--
--[dependencies.serde-hjson]
--version = "0.9"
--optional = true
-
- [dependencies.serde_json]
- version = "1.0.2"
-@@ -54,14 +50,13 @@
- features = ["serde"]
-
- [dev-dependencies.float-cmp]
--version = "0.4"
-+version = "0.6"
-
- [dev-dependencies.serde_derive]
- version = "1.0.8"
-
- [features]
--default = ["toml", "json", "yaml", "hjson",
"ini"]
--hjson = ["serde-hjson"]
-+default = ["toml", "json", "yaml", "ini"]
- ini = ["rust-ini"]
- json = ["serde_json"]
- yaml = ["yaml-rust"]
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5ac8255
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer used
diff --git a/rust-config.spec b/rust-config.spec
deleted file mode 100644
index a802559..0000000
--- a/rust-config.spec
+++ /dev/null
@@ -1,218 +0,0 @@
-# Generated by rust2rpm 17
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate config
-
-Name: rust-%{crate}
-Version: 0.10.1
-Release: 7%{?dist}
-Summary: Layered configuration system for Rust applications
-
-# Upstream license specification: MIT/Apache-2.0
-License: MIT or ASL 2.0
-URL:
https://crates.io/crates/config
-Source: %{crates_source}
-# Initial patched metadata
-# * serde-hjson is not packaged
-# * Update float-cmp to 0.6,
https://github.com/mehcode/config-rs/pull/131
-# * Update rust-ini to 0.15,
https://github.com/mehcode/config-rs/pull/152
-# * Bump rust-ini to 0.17
-Patch0: config-fix-metadata.diff
-# adapt to small API changes between rust-ini 0.13 and 0.15
-Patch1: 00-port-to-ini-0.15.patch
-# adapt to error message change in recent toml
-Patch2: 01-adapt-toml-error-message.patch
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Layered configuration system for Rust applications.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
-
-%files devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-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.
-
-%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+ini-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+ini-devel %{_description}
-
-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_no_tilde}/Cargo.toml
-
-%package -n %{name}+json-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+json-devel %{_description}
-
-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_no_tilde}/Cargo.toml
-
-%package -n %{name}+rust-ini-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+rust-ini-devel %{_description}
-
-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_no_tilde}/Cargo.toml
-
-%package -n %{name}+serde_json-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+serde_json-devel %{_description}
-
-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_no_tilde}/Cargo.toml
-
-%package -n %{name}+toml-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+toml-devel %{_description}
-
-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_no_tilde}/Cargo.toml
-
-%package -n %{name}+yaml-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+yaml-devel %{_description}
-
-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_no_tilde}/Cargo.toml
-
-%package -n %{name}+yaml-rust-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+yaml-rust-devel %{_description}
-
-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_no_tilde}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu May 27 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-6
-- Bump rust-ini to 0.17.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Nov 23 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-4
-- Bump rust-ini to 0.16.
-
-* Mon Sep 28 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-3
-- Bump rust-ini to 0.15.
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Feb 23 10:48:06 CET 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.10.1-1
-- Update to 0.10.1
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 09 2019 Josh Stone <jistone(a)redhat.com> - 0.9.3-1
-- Update to 0.9.3
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.2-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 08 2019 Josh Stone <jistone(a)redhat.com> - 0.9.2-1
-- Update to 0.9.2
-
-* Tue Nov 13 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-3
-- Adapt to new packaging
-
-* Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.1-2
-- Run tests in infrastructure
-- Bump rust-ini to 0.13
-
-* Thu Sep 27 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-1
-- Update to 0.9.1
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jul 06 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.0-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index 9c67c99..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (config-0.10.1.crate) =
912a5b7632a6a9ae8cbf3760e12c9c876b46e3cae7e5f27d733e38587b1eeb10ca4c66657855f500ad450ca725581518176caed8a8c608bdbe37cff7de843ba5
commit 02f7b63091d3338bb9755b388d417561bd49d124
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 23 13:37:44 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-config.spec b/rust-config.spec
index 71235a5..a802559 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.10.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -165,6 +165,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Thu May 27 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-6
- Bump rust-ini to 0.17.
commit 1ae0037438fcc612b350d4b6071630c2cf05f8c9
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu May 27 21:33:04 2021 +0200
bump rust-ini to 0.17
diff --git a/config-fix-metadata.diff b/config-fix-metadata.diff
index 65d3e9c..d48e4d2 100644
--- a/config-fix-metadata.diff
+++ b/config-fix-metadata.diff
@@ -1,11 +1,11 @@
--- config-0.10.1/Cargo.toml 2019-12-08T02:22:44+00:00
-+++ config-0.10.1/Cargo.toml 2020-11-23T13:08:14.082293+00:00
++++ config-0.10.1/Cargo.toml 2021-05-27T19:20:34.984539+00:00
@@ -28,15 +28,11 @@
version = "5.0.0"
[dependencies.rust-ini]
-version = "0.13"
-+version = "0.16"
++version = "0.17"
optional = true
[dependencies.serde]
diff --git a/rust-config.spec b/rust-config.spec
index eff4c54..71235a5 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 17
%bcond_without check
%global debug_package %{nil}
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.10.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -17,7 +17,7 @@ Source: %{crates_source}
# * serde-hjson is not packaged
# * Update float-cmp to 0.6,
https://github.com/mehcode/config-rs/pull/131
# * Update rust-ini to 0.15,
https://github.com/mehcode/config-rs/pull/152
-# * Bump rust-ini to 0.16
+# * Bump rust-ini to 0.17
Patch0: config-fix-metadata.diff
# adapt to small API changes between rust-ini 0.13 and 0.15
Patch1: 00-port-to-ini-0.15.patch
@@ -165,6 +165,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Thu May 27 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-6
+- Bump rust-ini to 0.17.
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 9968b8523901944a964ea560bcc4c016883fb214
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 17:10:57 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-config.spec b/rust-config.spec
index 04c5c05..eff4c54 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.10.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -165,6 +165,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Nov 23 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-4
- Bump rust-ini to 0.16.
commit 23356c435f6cd0cb543f07d5649e8653be749937
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon Nov 23 14:44:06 2020 +0100
bump rust-ini to 0.16
diff --git a/01-adapt-toml-error-message.patch b/01-adapt-toml-error-message.patch
new file mode 100644
index 0000000..6482c96
--- /dev/null
+++ b/01-adapt-toml-error-message.patch
@@ -0,0 +1,25 @@
+diff --git a/tests/errors.rs b/tests/errors.rs
+index 5f4a1a5..027097e 100644
+--- a/tests/errors.rs
++++ b/tests/errors.rs
+@@ -23,7 +23,7 @@ fn test_error_parse() {
+ assert!(res.is_err());
+ assert_eq!(
+ res.unwrap_err().to_string(),
+- "failed to parse datetime for key `error` at line 2 column 9 in
tests/Settings-invalid.toml".to_string()
++ "invalid TOML value, did you mean to use a quoted string? at line 2 column
9 in tests/Settings-invalid.toml".to_string()
+ );
+ }
+
+diff --git a/tests/file_toml.rs b/tests/file_toml.rs
+index d1ae5db..bb7aa23 100644
+--- a/tests/file_toml.rs
++++ b/tests/file_toml.rs
+@@ -82,6 +82,6 @@ fn test_error_parse() {
+ assert!(res.is_err());
+ assert_eq!(
+ res.unwrap_err().to_string(),
+- "failed to parse datetime for key `error` at line 2 column 9 in
tests/Settings-invalid.toml".to_string()
++ "invalid TOML value, did you mean to use a quoted string? at line 2 column
9 in tests/Settings-invalid.toml".to_string()
+ );
+ }
diff --git a/config-fix-metadata.diff b/config-fix-metadata.diff
index 45805e3..65d3e9c 100644
--- a/config-fix-metadata.diff
+++ b/config-fix-metadata.diff
@@ -1,15 +1,23 @@
--- config-0.10.1/Cargo.toml 2019-12-08T02:22:44+00:00
-+++ config-0.10.1/Cargo.toml 2020-09-28T23:24:14.343311+00:00
-@@ -28,7 +28,7 @@
++++ config-0.10.1/Cargo.toml 2020-11-23T13:08:14.082293+00:00
+@@ -28,15 +28,11 @@
version = "5.0.0"
[dependencies.rust-ini]
-version = "0.13"
-+version = "0.15"
++version = "0.16"
optional = true
[dependencies.serde]
-@@ -54,13 +54,13 @@
+ version = "1.0.8"
+-
+-[dependencies.serde-hjson]
+-version = "0.9"
+-optional = true
+
+ [dependencies.serde_json]
+ version = "1.0.2"
+@@ -54,14 +50,13 @@
features = ["serde"]
[dev-dependencies.float-cmp]
@@ -21,7 +29,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 40465fb..04c5c05 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 16
%bcond_without check
%global debug_package %{nil}
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.10.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -14,12 +14,15 @@ License: MIT or ASL 2.0
URL:
https://crates.io/crates/config
Source: %{crates_source}
# Initial patched metadata
-# * serde-hjson is not packaged, so remove from default features
+# * serde-hjson is not packaged
# * Update float-cmp to 0.6,
https://github.com/mehcode/config-rs/pull/131
# * Update rust-ini to 0.15,
https://github.com/mehcode/config-rs/pull/152
+# * Bump rust-ini to 0.16
Patch0: config-fix-metadata.diff
# adapt to small API changes between rust-ini 0.13 and 0.15
Patch1: 00-port-to-ini-0.15.patch
+# adapt to error message change in recent toml
+Patch2: 01-adapt-toml-error-message.patch
ExclusiveArch: %{rust_arches}
%if %{__cargo_skip_build}
@@ -59,18 +62,6 @@ which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
%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}
BuildArch: noarch
@@ -107,18 +98,6 @@ which use "rust-ini" feature of "%{crate}" crate.
%files -n %{name}+rust-ini-devel
%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}
BuildArch: noarch
@@ -186,6 +165,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Mon Nov 23 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-4
+- Bump rust-ini to 0.16.
+
* Mon Sep 28 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-3
- Bump rust-ini to 0.15.
commit 9f4267797257d56ca21bb1f13ec25da42cbb7538
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Sep 29 01:25:37 2020 +0200
bump rust-ini to 0.15
diff --git a/00-port-to-ini-0.15.patch b/00-port-to-ini-0.15.patch
new file mode 100644
index 0000000..cbbc1dd
--- /dev/null
+++ b/00-port-to-ini-0.15.patch
@@ -0,0 +1,49 @@
+diff --git a/src/file/format/ini.rs b/src/file/format/ini.rs
+index e5e5950..b463560 100644
+--- a/src/file/format/ini.rs
++++ b/src/file/format/ini.rs
+@@ -11,25 +11,25 @@ pub fn parse(
+ let mut map: HashMap<String, Value> = HashMap::new();
+ let i = Ini::load_from_str(text)?;
+ for (sec, prop) in i.iter() {
+- match *sec {
+- Some(ref sec) => {
++ match sec {
++ Some(sec) => {
+ let mut sec_map: HashMap<String, Value> = HashMap::new();
+ for (k, v) in prop.iter() {
+ sec_map.insert(
+- k.clone(),
+- Value::new(uri, ValueKind::String(v.clone())),
++ k.to_owned(),
++ Value::new(uri, ValueKind::String(v.to_owned())),
+ );
+ }
+ map.insert(
+- sec.clone(),
++ sec.to_owned(),
+ Value::new(uri, ValueKind::Table(sec_map)),
+ );
+ }
+ None => {
+ for (k, v) in prop.iter() {
+ map.insert(
+- k.clone(),
+- Value::new(uri, ValueKind::String(v.clone())),
++ k.to_owned(),
++ Value::new(uri, ValueKind::String(v.to_owned())),
+ );
+ }
+ }
+diff --git a/tests/file_ini.rs b/tests/file_ini.rs
+index 0b7b6a0..844beea 100644
+--- a/tests/file_ini.rs
++++ b/tests/file_ini.rs
+@@ -63,6 +63,6 @@ fn test_error_parse() {
+ assert!(res.is_err());
+ assert_eq!(
+ res.unwrap_err().to_string(),
+- r#"2:0 Expecting "[Some('='), Some(':')]" but
found EOF. in tests/Settings-invalid.ini"#
++ r#"2:0 expecting "[Some('='), Some(':')]" but
found EOF. in tests/Settings-invalid.ini"#
+ );
+ }
diff --git a/config-fix-metadata.diff b/config-fix-metadata.diff
index 669a9fc..45805e3 100644
--- a/config-fix-metadata.diff
+++ b/config-fix-metadata.diff
@@ -1,5 +1,14 @@
--- 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
++++ config-0.10.1/Cargo.toml 2020-09-28T23:24:14.343311+00:00
+@@ -28,7 +28,7 @@
+ version = "5.0.0"
+
+ [dependencies.rust-ini]
+-version = "0.13"
++version = "0.15"
+ optional = true
+
+ [dependencies.serde]
@@ -54,13 +54,13 @@
features = ["serde"]
diff --git a/rust-config.spec b/rust-config.spec
index 09c915d..40465fb 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -16,7 +16,10 @@ Source: %{crates_source}
# Initial patched metadata
# * serde-hjson is not packaged, so remove from default features
# * Update float-cmp to 0.6,
https://github.com/mehcode/config-rs/pull/131
+# * Update rust-ini to 0.15,
https://github.com/mehcode/config-rs/pull/152
Patch0: config-fix-metadata.diff
+# adapt to small API changes between rust-ini 0.13 and 0.15
+Patch1: 00-port-to-ini-0.15.patch
ExclusiveArch: %{rust_arches}
%if %{__cargo_skip_build}
@@ -183,6 +186,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Mon Sep 28 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.10.1-3
+- Bump rust-ini to 0.15.
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit b70fffaa297b46dc62acfc4702fc04acd6fcaeb9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 07:43:50 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-config.spec b/rust-config.spec
index b603148..09c915d 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -183,6 +183,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Sun Feb 23 10:48:06 CET 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> -
0.10.1-1
- Update to 0.10.1
commit f719c38016a64ea5e4456ef4574a290a9acdb247
Author: Igor Raits <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 23 10:49:10 2020 +0100
Update to 0.10.1
Signed-off-by: Igor Raits <ignatenkobrain(a)fedoraproject.org>
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 <ignatenkobrain(a)fedoraproject.org> -
0.10.1-1
+- Update to 0.10.1
+
* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 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
commit 446b5a668ee826b47eced1685fabf694a578756c
Author: Igor Raits <ignatenkobrain(a)fedoraproject.org>
Date: Wed Feb 12 10:44:58 2020 +0100
Drop tests
They do not work for quite long time.
Signed-off-by: Igor Raits <ignatenkobrain(a)fedoraproject.org>
diff --git a/tests/.fmf/version b/tests/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/tests/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/provision.fmf b/tests/provision.fmf
deleted file mode 100644
index 503a97c..0000000
--- a/tests/provision.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
----
-standard-inventory-qcow2:
- qemu:
- # `cargo test` usually eats more than 1G.
- m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 5c6ad14..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: localhost
- roles:
- - role: standard-test-basic
- tags:
- - classic
- repositories:
- - repo: "https://src.fedoraproject.org/tests/rust.git"
- dest: rust
- tests:
- - rust/cargo-test
- environment:
- pkg: rust-config
commit ec2435ac0d41d6a95462d0424c266f4007600238
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 30 20:10:40 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-config.spec b/rust-config.spec
index 6ea470a..45c85c8 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -7,7 +7,7 @@
Name: rust-%{crate}
Version: 0.9.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -166,6 +166,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit f632c491dc621f0acdbb979457a255cb1891e4cc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 26 20:44:24 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-config.spec b/rust-config.spec
index 2fa9794..6ea470a 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -7,7 +7,7 @@
Name: rust-%{crate}
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -166,6 +166,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Thu May 09 2019 Josh Stone <jistone(a)redhat.com> - 0.9.3-1
- Update to 0.9.3
commit 5f0e6923fc403c20a0e7a8592cda2769bb4b737c
Author: Josh Stone <jistone(a)redhat.com>
Date: Thu May 9 12:30:13 2019 -0700
Update to 0.9.3
diff --git a/.gitignore b/.gitignore
index 7069ced..4e4779b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/config-0.9.0.crate
/config-0.9.1.crate
/config-0.9.2.crate
+/config-0.9.3.crate
diff --git a/rust-config.spec b/rust-config.spec
index 8dd3055..2fa9794 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm
+# Generated by rust2rpm-9-1.fc30
# * Tests are run in infrastructure
%bcond_with check
%global debug_package %{nil}
@@ -6,14 +6,14 @@
%global crate config
Name: rust-%{crate}
-Version: 0.9.2
-Release: 2%{?dist}
+Version: 0.9.3
+Release: 1%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
License: MIT or ASL 2.0
URL:
https://crates.io/crates/config
-Source0:
https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+Source: %{crates_source}
# Initial patched metadata
# * No hjson support, that crate is outdated
Patch0: config-fix-metadata.diff
@@ -151,7 +151,7 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
%build
@@ -166,6 +166,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Thu May 09 2019 Josh Stone <jistone(a)redhat.com> - 0.9.3-1
+- Update to 0.9.3
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index ecc5603..61acf11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (config-0.9.2.crate) =
3e92768d02f6aab313123b59216d45c79ade3251cc4c1cd95367c09b5b8643ea2b1bdb2468b46dcd06263c7149c3fc3bc2482c46b95d6be327d5df82a7a30181
+SHA512 (config-0.9.3.crate) =
60241f9d553d7715130d686177f0a8f6000018def99b7c6acc38e1fa0c55374f97a77900cff6359567d89622a12050a6f7aefafde034b913666b143d4e6d7494
commit 184dd7e4dc1ad91aa3d6bbade2cea4c214f2a7a7
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 2 13:28:59 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-config.spec b/rust-config.spec
index ab904e6..8dd3055 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -7,7 +7,7 @@
Name: rust-%{crate}
Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -166,6 +166,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Tue Jan 08 2019 Josh Stone <jistone(a)redhat.com> - 0.9.2-1
- Update to 0.9.2
commit e81440e3dc04dffdf6448e1f4f71fe58c6cb111d
Author: Josh Stone <jistone(a)redhat.com>
Date: Mon Jan 7 16:06:25 2019 -0800
Update to 0.9.2
diff --git a/.gitignore b/.gitignore
index eef9849..7069ced 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/config-0.9.0.crate
/config-0.9.1.crate
+/config-0.9.2.crate
diff --git a/0001-Fix-75-tests-run-with-no-default-features.patch
b/0001-Fix-75-tests-run-with-no-default-features.patch
deleted file mode 100644
index 393561a..0000000
--- a/0001-Fix-75-tests-run-with-no-default-features.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 1612293b617f5459d2313c776d5117401c6aa8c2 Mon Sep 17 00:00:00 2001
-From: Ryan Leckey <ryan(a)launchbadge.com>
-Date: Tue, 25 Sep 2018 23:58:34 -0700
-Subject: [PATCH] Fix #75; tests run with --no-default-features
-
----
- tests/datetime.rs | 8 ++++++++
- tests/errors.rs | 2 ++
- tests/file.rs | 2 ++
- tests/file_hjson.rs | 2 ++
- tests/file_ini.rs | 2 ++
- tests/file_json.rs | 2 ++
- tests/file_toml.rs | 2 ++
- tests/file_yaml.rs | 2 ++
- tests/get.rs | 2 ++
- tests/merge.rs | 2 ++
- tests/set.rs | 4 ++++
- 11 files changed, 30 insertions(+)
-
-diff --git a/tests/datetime.rs b/tests/datetime.rs
-index f318f03..6c1e620 100644
---- a/tests/datetime.rs
-+++ b/tests/datetime.rs
-@@ -1,3 +1,11 @@
-+#![cfg(all(
-+ feature = "toml",
-+ feature = "json",
-+ feature = "hjson",
-+ feature = "yaml",
-+ feature = "ini",
-+))]
-+
- extern crate chrono;
- extern crate config;
-
-diff --git a/tests/errors.rs b/tests/errors.rs
-index 77a58ab..6bc674f 100644
---- a/tests/errors.rs
-+++ b/tests/errors.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "toml")]
-+
- extern crate config;
-
- use config::*;
-diff --git a/tests/file.rs b/tests/file.rs
-index c89d5da..0680c2a 100644
---- a/tests/file.rs
-+++ b/tests/file.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "yaml")]
-+
- extern crate config;
-
- use config::*;
-diff --git a/tests/file_hjson.rs b/tests/file_hjson.rs
-index 40c25cb..9c63ad6 100644
---- a/tests/file_hjson.rs
-+++ b/tests/file_hjson.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "hjson")]
-+
- extern crate config;
- extern crate float_cmp;
- extern crate serde;
-diff --git a/tests/file_ini.rs b/tests/file_ini.rs
-index 30d86a3..833cab0 100644
---- a/tests/file_ini.rs
-+++ b/tests/file_ini.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "ini")]
-+
- extern crate config;
- extern crate float_cmp;
- extern crate serde;
-diff --git a/tests/file_json.rs b/tests/file_json.rs
-index c07a77d..4b586b2 100644
---- a/tests/file_json.rs
-+++ b/tests/file_json.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "json")]
-+
- extern crate config;
- extern crate float_cmp;
- extern crate serde;
-diff --git a/tests/file_toml.rs b/tests/file_toml.rs
-index b1e70c0..0b5db4f 100644
---- a/tests/file_toml.rs
-+++ b/tests/file_toml.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "toml")]
-+
- extern crate config;
- extern crate float_cmp;
- extern crate serde;
-diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs
-index 1d00d85..85788c4 100644
---- a/tests/file_yaml.rs
-+++ b/tests/file_yaml.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "yaml")]
-+
- extern crate config;
- extern crate float_cmp;
- extern crate serde;
-diff --git a/tests/get.rs b/tests/get.rs
-index 87f80a1..73eeeaf 100644
---- a/tests/get.rs
-+++ b/tests/get.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "toml")]
-+
- extern crate config;
- extern crate float_cmp;
- extern crate serde;
-diff --git a/tests/merge.rs b/tests/merge.rs
-index d6eb9e0..1be7db1 100644
---- a/tests/merge.rs
-+++ b/tests/merge.rs
-@@ -1,3 +1,5 @@
-+#![cfg(feature = "toml")]
-+
- extern crate config;
-
- use config::*;
-diff --git a/tests/set.rs b/tests/set.rs
-index e1f6290..bd439a0 100644
---- a/tests/set.rs
-+++ b/tests/set.rs
-@@ -11,6 +11,7 @@ fn test_set_scalar() {
- assert_eq!(c.get("value").ok(), Some(true));
- }
-
-+#[cfg(feature = "toml")]
- #[test]
- fn test_set_scalar_default() {
- let mut c = Config::default();
-@@ -25,6 +26,7 @@ fn test_set_scalar_default() {
- assert_eq!(c.get("staging").ok(), Some(false));
- }
-
-+#[cfg(feature = "toml")]
- #[test]
- fn test_set_scalar_path() {
- let mut c = Config::default();
-@@ -43,6 +45,7 @@ fn test_set_scalar_path() {
- assert_eq!(c.get("place.blocked").ok(), Some(true));
- }
-
-+#[cfg(feature = "toml")]
- #[test]
- fn test_set_arr_path() {
- let mut c = Config::default();
-@@ -74,6 +77,7 @@ fn test_set_arr_path() {
- assert_eq!(c.get("items[2]").ok(), Some("George".to_string()));
- }
-
-+#[cfg(feature = "toml")]
- #[test]
- fn test_set_capital() {
- let mut c = Config::default();
---
-2.19.0
-
diff --git a/config-fix-metadata.diff b/config-fix-metadata.diff
index 9a7d06b..ebe35e6 100644
--- a/config-fix-metadata.diff
+++ b/config-fix-metadata.diff
@@ -1,22 +1,16 @@
---- config-0.9.1/Cargo.toml 1970-01-01T01:00:00+01:00
-+++ config-0.9.1/Cargo.toml 2018-10-07T10:14:42.053190+02:00
-@@ -28,15 +28,11 @@
- version = "4.0.0"
-
- [dependencies.rust-ini]
--version = "0.12"
-+version = "0.13"
- optional = true
-
+--- 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"
--
+
-[dependencies.serde-hjson]
--version = "0.8.1"
+-version = "0.8.2"
-optional = true
-
+-
[dependencies.serde_json]
version = "1.0.2"
+ optional = true
@@ -60,8 +56,7 @@
version = "1.0.8"
diff --git a/rust-config.spec b/rust-config.spec
index cd28ced..ab904e6 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -6,8 +6,8 @@
%global crate config
Name: rust-%{crate}
-Version: 0.9.1
-Release: 3%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -16,10 +16,7 @@ URL:
https://crates.io/crates/config
Source0:
https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
# Initial patched metadata
# * No hjson support, that crate is outdated
-# * Bump rust-ini to 0.13,
https://github.com/mehcode/config-rs/pull/80
Patch0: config-fix-metadata.diff
-#
https://github.com/mehcode/config-rs/commit/1612293b617f5459d2313c776d511...
-Patch0001: 0001-Fix-75-tests-run-with-no-default-features.patch
ExclusiveArch: %{rust_arches}
@@ -169,6 +166,9 @@ which use "yaml-rust" feature of "%{crate}"
crate.
%endif
%changelog
+* Tue Jan 08 2019 Josh Stone <jistone(a)redhat.com> - 0.9.2-1
+- Update to 0.9.2
+
* Tue Nov 13 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-3
- Adapt to new packaging
diff --git a/sources b/sources
index b9bba87..ecc5603 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (config-0.9.1.crate) =
56699d3963e5923b640404dea27b356a413b08ede40a72d800179f2f14d9a1aa59897bfde9f5e824722e9f925b927fb44ed0dedba3cee73ee16ce88e6a34c154
+SHA512 (config-0.9.2.crate) =
3e92768d02f6aab313123b59216d45c79ade3251cc4c1cd95367c09b5b8643ea2b1bdb2468b46dcd06263c7149c3fc3bc2482c46b95d6be327d5df82a7a30181
commit bc7571b729cd1550c880afed3893f75fba9bccd0
Author: Josh Stone <jistone(a)redhat.com>
Date: Mon Nov 12 16:33:28 2018 -0800
Adapt to new packaging
diff --git a/rust-config.spec b/rust-config.spec
index 097ace6..cd28ced 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -7,7 +7,7 @@
Name: rust-%{crate}
Version: 0.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -24,33 +24,134 @@ Patch0001: 0001-Fix-75-tests-run-with-no-default-features.patch
ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging
-# [dependencies]
-BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0)
-BuildRequires: (crate(nom) >= 4.0.0 with crate(nom) < 5.0.0)
-BuildRequires: (crate(rust-ini) >= 0.13.0 with crate(rust-ini) < 0.14.0)
-BuildRequires: (crate(serde) >= 1.0.8 with crate(serde) < 2.0.0)
-BuildRequires: (crate(serde_json) >= 1.0.2 with crate(serde_json) < 2.0.0)
-BuildRequires: (crate(toml) >= 0.4.1 with crate(toml) < 0.5.0)
-BuildRequires: (crate(yaml-rust) >= 0.4.0 with crate(yaml-rust) < 0.5.0)
+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}
-# [dev-dependencies]
-BuildRequires: ((crate(chrono) >= 0.4.0 with crate(chrono) < 0.5.0) with
crate(chrono/serde))
-BuildRequires: (crate(float-cmp) >= 0.4.0 with crate(float-cmp) < 0.5.0)
-BuildRequires: (crate(serde_derive) >= 1.0.8 with crate(serde_derive) < 2.0.0)
+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
-%description
-%{summary}.
+%global _description \
+Layered configuration system for Rust applications.
+
+%description %{_description}
%package devel
Summary: %{summary}
BuildArch: noarch
-%description devel
-Layered configuration system for Rust applications.
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md CHANGELOG.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+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.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+ini-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+ini-devel %{_description}
+
+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
+
+%package -n %{name}+json-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+json-devel %{_description}
+
+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
+
+%package -n %{name}+rust-ini-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+rust-ini-devel %{_description}
This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "rust-ini" feature of "%{crate}" crate.
+
+%files -n %{name}+rust-ini-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+serde_json-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde_json-devel %{_description}
+
+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
+
+%package -n %{name}+toml-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+toml-devel %{_description}
+
+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
+
+%package -n %{name}+yaml-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+yaml-devel %{_description}
+
+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
+
+%package -n %{name}+yaml-rust-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+yaml-rust-devel %{_description}
+
+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
%prep
%autosetup -n %{crate}-%{version} -p1
@@ -67,12 +168,10 @@ which use %{crate} from crates.io.
%cargo_test
%endif
-%files devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version}/
-
%changelog
+* Tue Nov 13 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-3
+- Adapt to new packaging
+
* Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.1-2
- Run tests in infrastructure
- Bump rust-ini to 0.13
commit 5e0bd9adab52b86e3e32284c9b9f478d90f01ae8
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Oct 7 10:18:05 2018 +0200
Run tests in infrastructure + Bump rust-ini to 0.13
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/0001-Fix-75-tests-run-with-no-default-features.patch
b/0001-Fix-75-tests-run-with-no-default-features.patch
new file mode 100644
index 0000000..393561a
--- /dev/null
+++ b/0001-Fix-75-tests-run-with-no-default-features.patch
@@ -0,0 +1,164 @@
+From 1612293b617f5459d2313c776d5117401c6aa8c2 Mon Sep 17 00:00:00 2001
+From: Ryan Leckey <ryan(a)launchbadge.com>
+Date: Tue, 25 Sep 2018 23:58:34 -0700
+Subject: [PATCH] Fix #75; tests run with --no-default-features
+
+---
+ tests/datetime.rs | 8 ++++++++
+ tests/errors.rs | 2 ++
+ tests/file.rs | 2 ++
+ tests/file_hjson.rs | 2 ++
+ tests/file_ini.rs | 2 ++
+ tests/file_json.rs | 2 ++
+ tests/file_toml.rs | 2 ++
+ tests/file_yaml.rs | 2 ++
+ tests/get.rs | 2 ++
+ tests/merge.rs | 2 ++
+ tests/set.rs | 4 ++++
+ 11 files changed, 30 insertions(+)
+
+diff --git a/tests/datetime.rs b/tests/datetime.rs
+index f318f03..6c1e620 100644
+--- a/tests/datetime.rs
++++ b/tests/datetime.rs
+@@ -1,3 +1,11 @@
++#![cfg(all(
++ feature = "toml",
++ feature = "json",
++ feature = "hjson",
++ feature = "yaml",
++ feature = "ini",
++))]
++
+ extern crate chrono;
+ extern crate config;
+
+diff --git a/tests/errors.rs b/tests/errors.rs
+index 77a58ab..6bc674f 100644
+--- a/tests/errors.rs
++++ b/tests/errors.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "toml")]
++
+ extern crate config;
+
+ use config::*;
+diff --git a/tests/file.rs b/tests/file.rs
+index c89d5da..0680c2a 100644
+--- a/tests/file.rs
++++ b/tests/file.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "yaml")]
++
+ extern crate config;
+
+ use config::*;
+diff --git a/tests/file_hjson.rs b/tests/file_hjson.rs
+index 40c25cb..9c63ad6 100644
+--- a/tests/file_hjson.rs
++++ b/tests/file_hjson.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "hjson")]
++
+ extern crate config;
+ extern crate float_cmp;
+ extern crate serde;
+diff --git a/tests/file_ini.rs b/tests/file_ini.rs
+index 30d86a3..833cab0 100644
+--- a/tests/file_ini.rs
++++ b/tests/file_ini.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "ini")]
++
+ extern crate config;
+ extern crate float_cmp;
+ extern crate serde;
+diff --git a/tests/file_json.rs b/tests/file_json.rs
+index c07a77d..4b586b2 100644
+--- a/tests/file_json.rs
++++ b/tests/file_json.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "json")]
++
+ extern crate config;
+ extern crate float_cmp;
+ extern crate serde;
+diff --git a/tests/file_toml.rs b/tests/file_toml.rs
+index b1e70c0..0b5db4f 100644
+--- a/tests/file_toml.rs
++++ b/tests/file_toml.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "toml")]
++
+ extern crate config;
+ extern crate float_cmp;
+ extern crate serde;
+diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs
+index 1d00d85..85788c4 100644
+--- a/tests/file_yaml.rs
++++ b/tests/file_yaml.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "yaml")]
++
+ extern crate config;
+ extern crate float_cmp;
+ extern crate serde;
+diff --git a/tests/get.rs b/tests/get.rs
+index 87f80a1..73eeeaf 100644
+--- a/tests/get.rs
++++ b/tests/get.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "toml")]
++
+ extern crate config;
+ extern crate float_cmp;
+ extern crate serde;
+diff --git a/tests/merge.rs b/tests/merge.rs
+index d6eb9e0..1be7db1 100644
+--- a/tests/merge.rs
++++ b/tests/merge.rs
+@@ -1,3 +1,5 @@
++#![cfg(feature = "toml")]
++
+ extern crate config;
+
+ use config::*;
+diff --git a/tests/set.rs b/tests/set.rs
+index e1f6290..bd439a0 100644
+--- a/tests/set.rs
++++ b/tests/set.rs
+@@ -11,6 +11,7 @@ fn test_set_scalar() {
+ assert_eq!(c.get("value").ok(), Some(true));
+ }
+
++#[cfg(feature = "toml")]
+ #[test]
+ fn test_set_scalar_default() {
+ let mut c = Config::default();
+@@ -25,6 +26,7 @@ fn test_set_scalar_default() {
+ assert_eq!(c.get("staging").ok(), Some(false));
+ }
+
++#[cfg(feature = "toml")]
+ #[test]
+ fn test_set_scalar_path() {
+ let mut c = Config::default();
+@@ -43,6 +45,7 @@ fn test_set_scalar_path() {
+ assert_eq!(c.get("place.blocked").ok(), Some(true));
+ }
+
++#[cfg(feature = "toml")]
+ #[test]
+ fn test_set_arr_path() {
+ let mut c = Config::default();
+@@ -74,6 +77,7 @@ fn test_set_arr_path() {
+ assert_eq!(c.get("items[2]").ok(), Some("George".to_string()));
+ }
+
++#[cfg(feature = "toml")]
+ #[test]
+ fn test_set_capital() {
+ let mut c = Config::default();
+--
+2.19.0
+
diff --git a/config-0.9.0-fix-metadata.diff b/config-fix-metadata.diff
similarity index 65%
rename from config-0.9.0-fix-metadata.diff
rename to config-fix-metadata.diff
index 9f5c6fb..9a7d06b 100644
--- a/config-0.9.0-fix-metadata.diff
+++ b/config-fix-metadata.diff
@@ -1,16 +1,22 @@
---- config-0.9.0/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ config-0.9.0/Cargo.toml 2018-07-06T16:02:41.756971+01:00
-@@ -34,10 +34,6 @@
+--- config-0.9.1/Cargo.toml 1970-01-01T01:00:00+01:00
++++ config-0.9.1/Cargo.toml 2018-10-07T10:14:42.053190+02:00
+@@ -28,15 +28,11 @@
+ version = "4.0.0"
+
+ [dependencies.rust-ini]
+-version = "0.12"
++version = "0.13"
+ optional = true
+
[dependencies.serde]
version = "1.0.8"
-
+-
-[dependencies.serde-hjson]
-version = "0.8.1"
-optional = true
--
+
[dependencies.serde_json]
version = "1.0.2"
- optional = true
@@ -60,8 +56,7 @@
version = "1.0.8"
diff --git a/rust-config.spec b/rust-config.spec
index e9e93ed..097ace6 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -1,12 +1,13 @@
# Generated by rust2rpm
-%bcond_without check
+# * Tests are run in infrastructure
+%bcond_with check
%global debug_package %{nil}
%global crate config
Name: rust-%{crate}
Version: 0.9.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Layered configuration system for Rust applications
# Upstream license specification: MIT/Apache-2.0
@@ -15,7 +16,10 @@ URL:
https://crates.io/crates/config
Source0:
https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
# Initial patched metadata
# * No hjson support, that crate is outdated
-Patch0: config-0.9.0-fix-metadata.diff
+# * Bump rust-ini to 0.13,
https://github.com/mehcode/config-rs/pull/80
+Patch0: config-fix-metadata.diff
+#
https://github.com/mehcode/config-rs/commit/1612293b617f5459d2313c776d511...
+Patch0001: 0001-Fix-75-tests-run-with-no-default-features.patch
ExclusiveArch: %{rust_arches}
@@ -23,7 +27,7 @@ BuildRequires: rust-packaging
# [dependencies]
BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0)
BuildRequires: (crate(nom) >= 4.0.0 with crate(nom) < 5.0.0)
-BuildRequires: (crate(rust-ini) >= 0.12.0 with crate(rust-ini) < 0.13.0)
+BuildRequires: (crate(rust-ini) >= 0.13.0 with crate(rust-ini) < 0.14.0)
BuildRequires: (crate(serde) >= 1.0.8 with crate(serde) < 2.0.0)
BuildRequires: (crate(serde_json) >= 1.0.2 with crate(serde_json) < 2.0.0)
BuildRequires: (crate(toml) >= 0.4.1 with crate(toml) < 0.5.0)
@@ -60,8 +64,7 @@ which use %{crate} from crates.io.
%if %{with check}
%check
-#
https://github.com/mehcode/config-rs/issues/75
-%cargo_test || :
+%cargo_test
%endif
%files devel
@@ -70,6 +73,10 @@ which use %{crate} from crates.io.
%{cargo_registry}/%{crate}-%{version}/
%changelog
+* Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.1-2
+- Run tests in infrastructure
+- Bump rust-ini to 0.13
+
* Thu Sep 27 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-1
- Update to 0.9.1
diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/provision.fmf b/tests/provision.fmf
new file mode 100644
index 0000000..503a97c
--- /dev/null
+++ b/tests/provision.fmf
@@ -0,0 +1,5 @@
+---
+standard-inventory-qcow2:
+ qemu:
+ # `cargo test` usually eats more than 1G.
+ m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..5c6ad14
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+---
+- hosts: localhost
+ roles:
+ - role: standard-test-basic
+ tags:
+ - classic
+ repositories:
+ - repo: "https://src.fedoraproject.org/tests/rust.git"
+ dest: rust
+ tests:
+ - rust/cargo-test
+ environment:
+ pkg: rust-config
commit 1eb839ad0bbee63c12a72f804fc9712759fdf7b1
Author: Josh Stone <jistone(a)redhat.com>
Date: Thu Sep 27 16:55:07 2018 -0700
Update to 0.9.1
diff --git a/.gitignore b/.gitignore
index a47a275..eef9849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/config-0.9.0.crate
+/config-0.9.1.crate
diff --git a/rust-config.spec b/rust-config.spec
index e130982..e9e93ed 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -5,10 +5,11 @@
%global crate config
Name: rust-%{crate}
-Version: 0.9.0
-Release: 2%{?dist}
+Version: 0.9.1
+Release: 1%{?dist}
Summary: Layered configuration system for Rust applications
+# Upstream license specification: MIT/Apache-2.0
License: MIT or ASL 2.0
URL:
https://crates.io/crates/config
Source0:
https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
@@ -69,6 +70,9 @@ which use %{crate} from crates.io.
%{cargo_registry}/%{crate}-%{version}/
%changelog
+* Thu Sep 27 2018 Josh Stone <jistone(a)redhat.com> - 0.9.1-1
+- Update to 0.9.1
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index ed742ff..b9bba87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (config-0.9.0.crate) =
0b6e4dde4f4d064839a4ed6fc4a5fab3fd21f16594fda10e53b33d248eba1042ece5478b3d1c969b1b71b396d617aaa33d29331f4830194804ec7ffdb10acf4c
+SHA512 (config-0.9.1.crate) =
56699d3963e5923b640404dea27b356a413b08ede40a72d800179f2f14d9a1aa59897bfde9f5e824722e9f925b927fb44ed0dedba3cee73ee16ce88e6a34c154
commit 677946c5165e0f1cee81363488235c57d97c2805
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 05:02:22 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-config.spec b/rust-config.spec
index 4a95650..e130982 100644
--- a/rust-config.spec
+++ b/rust-config.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Layered configuration system for Rust applications
License: MIT or ASL 2.0
@@ -69,5 +69,8 @@ which use %{crate} from crates.io.
%{cargo_registry}/%{crate}-%{version}/
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Fri Jul 06 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.0-1
- Initial package
commit 8474b565a5eb43c478606a01ade179e8e548148a
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jul 10 17:47:17 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a47a275
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/config-0.9.0.crate
diff --git a/config-0.9.0-fix-metadata.diff b/config-0.9.0-fix-metadata.diff
new file mode 100644
index 0000000..9f5c6fb
--- /dev/null
+++ b/config-0.9.0-fix-metadata.diff
@@ -0,0 +1,23 @@
+--- config-0.9.0/Cargo.toml 1970-01-01T00:00:00+00:00
++++ config-0.9.0/Cargo.toml 2018-07-06T16:02:41.756971+01:00
+@@ -34,10 +34,6 @@
+ [dependencies.serde]
+ version = "1.0.8"
+
+-[dependencies.serde-hjson]
+-version = "0.8.1"
+-optional = true
+-
+ [dependencies.serde_json]
+ version = "1.0.2"
+ optional = true
+@@ -60,8 +56,7 @@
+ version = "1.0.8"
+
+ [features]
+-default = ["toml", "json", "yaml", "hjson",
"ini"]
+-hjson = ["serde-hjson"]
++default = ["toml", "json", "yaml", "ini"]
+ ini = ["rust-ini"]
+ json = ["serde_json"]
+ yaml = ["yaml-rust"]
diff --git a/rust-config.spec b/rust-config.spec
new file mode 100644
index 0000000..4a95650
--- /dev/null
+++ b/rust-config.spec
@@ -0,0 +1,73 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate config
+
+Name: rust-%{crate}
+Version: 0.9.0
+Release: 1%{?dist}
+Summary: Layered configuration system for Rust applications
+
+License: MIT or ASL 2.0
+URL:
https://crates.io/crates/config
+Source0:
https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+# Initial patched metadata
+# * No hjson support, that crate is outdated
+Patch0: config-0.9.0-fix-metadata.diff
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0)
+BuildRequires: (crate(nom) >= 4.0.0 with crate(nom) < 5.0.0)
+BuildRequires: (crate(rust-ini) >= 0.12.0 with crate(rust-ini) < 0.13.0)
+BuildRequires: (crate(serde) >= 1.0.8 with crate(serde) < 2.0.0)
+BuildRequires: (crate(serde_json) >= 1.0.2 with crate(serde_json) < 2.0.0)
+BuildRequires: (crate(toml) >= 0.4.1 with crate(toml) < 0.5.0)
+BuildRequires: (crate(yaml-rust) >= 0.4.0 with crate(yaml-rust) < 0.5.0)
+%if %{with check}
+# [dev-dependencies]
+BuildRequires: ((crate(chrono) >= 0.4.0 with crate(chrono) < 0.5.0) with
crate(chrono/serde))
+BuildRequires: (crate(float-cmp) >= 0.4.0 with crate(float-cmp) < 0.5.0)
+BuildRequires: (crate(serde_derive) >= 1.0.8 with crate(serde_derive) < 2.0.0)
+%endif
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+Layered configuration system for Rust applications.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+#
https://github.com/mehcode/config-rs/issues/75
+%cargo_test || :
+%endif
+
+%files devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md CHANGELOG.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%changelog
+* Fri Jul 06 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.9.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..ed742ff
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (config-0.9.0.crate) =
0b6e4dde4f4d064839a4ed6fc4a5fab3fd21f16594fda10e53b33d248eba1042ece5478b3d1c969b1b71b396d617aaa33d29331f4830194804ec7ffdb10acf4c