diff --git a/rust-indexmap.spec b/rust-indexmap.spec index 42cce7b..8c77100 100644 --- a/rust-indexmap.spec +++ b/rust-indexmap.spec @@ -7,7 +7,7 @@ Name: rust-%{crate} Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hash table with consistent order and fast iteration # Upstream license specification: Apache-2.0/MIT @@ -18,39 +18,81 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) +BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(fnv) >= 1.0.0 with crate(fnv) < 2.0.0) -BuildRequires: (crate(itertools) >= 0.7.0 with crate(itertools) < 0.8.0) -BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0) +BuildRequires: (crate(fnv/default) >= 1.0.0 with crate(fnv/default) < 2.0.0) +BuildRequires: (crate(itertools/default) >= 0.7.0 with crate(itertools/default) < 0.8.0) +BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) BuildRequires: (crate(quickcheck) >= 0.6.0 with crate(quickcheck) < 0.7.0) -BuildRequires: (crate(rand) >= 0.4.0 with crate(rand) < 0.5.0) -BuildRequires: (crate(serde_test) >= 1.0.5 with crate(serde_test) < 2.0.0) +BuildRequires: (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0) +BuildRequires: (crate(serde_test/default) >= 1.0.5 with crate(serde_test/default) < 2.0.0) %endif -%description -%{summary}. +%global _description \ +A hash table with consistent order and fast iteration.\ +\ +The indexmap is a hash table\ +where the iteration order of the key-value pairs is\ +independent of the hash values of the keys.\ +It has the usual hash table functionality,\ +it preservesinsertion order except after removals,\ +and it allows lookup of its elements by either hash table key\ +or numerical index. A corresponding hash set type is also provided.\ +\ +This crate was initially published under the name ordermap,\ +but it was renamed to indexmap. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -A hash table with consistent order and fast iteration. +%description devel %{_description} -The indexmap is a hash table where the iteration order of the key-value -pairs is independent of the hash values of the keys. It has the usual -hash table functionality, it preserves insertion order except after -removals, and it allows lookup of its elements by either hash table key -or numerical index. A corresponding hash set type is also provided. +This package contains library source intended for building other packages +which use "%{crate}" crate. -This crate was initially published under the name ordermap, -but it was renamed to indexmap. +%files devel +%license LICENSE-APACHE LICENSE-MIT +%doc README.rst +%{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 %{crate} from crates.io. +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+serde-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-devel %{_description} + +This package contains library source intended for building other packages +which use "serde" feature of "%{crate}" crate. + +%files -n %{name}+serde-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+serde-1-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-1-devel %{_description} + +This package contains library source intended for building other packages +which use "serde-1" feature of "%{crate}" crate. + +%files -n %{name}+serde-1-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -p1 @@ -67,12 +109,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-APACHE LICENSE-MIT -%doc README.rst -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Fri Oct 26 2018 Igor Gnatenko - 1.0.2-2 +- Adapt to new packaging + * Mon Oct 22 2018 Josh Stone - 1.0.2-1 - Update to 1.0.2