diff --git a/lock_api-fix-metadata.diff b/lock_api-fix-metadata.diff new file mode 100644 index 0000000..e85ff7f --- /dev/null +++ b/lock_api-fix-metadata.diff @@ -0,0 +1,11 @@ +--- lock_api-0.1.4/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ lock_api-0.1.4/Cargo.toml 2018-10-28T01:02:15.172527+02:00 +@@ -20,7 +20,7 @@ + license = "Apache-2.0/MIT" + repository = "https://github.com/Amanieu/parking_lot" + [dependencies.owning_ref] +-version = "0.3" ++version = "0.4" + optional = true + + [dependencies.scopeguard] diff --git a/rust-lock_api.spec b/rust-lock_api.spec index a5de04c..571d58c 100644 --- a/rust-lock_api.spec +++ b/rust-lock_api.spec @@ -7,34 +7,65 @@ Name: rust-%{crate} Version: 0.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wrappers to create fully-featured Mutex and RwLock types # Upstream license specification: Apache-2.0/MIT License: ASL 2.0 or MIT URL: https://crates.io/crates/lock_api Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +# Initial patched metadata +# * Bump owning_ref to 0.4, https://github.com/Amanieu/parking_lot/pull/99 +Patch0: lock_api-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(owning_ref) >= 0.3.0 with crate(owning_ref) < 0.4.0) +BuildRequires: (crate(owning_ref/default) >= 0.4.0 with crate(owning_ref/default) < 0.5.0) BuildRequires: (crate(scopeguard) >= 0.3.0 with crate(scopeguard) < 0.4.0) -%description -%{summary}. +%global _description \ +Wrappers to create fully-featured Mutex and RwLock types.\ +Compatible with no_std. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -Wrappers to create fully-featured Mutex and RwLock types. Compatible with -no_std. +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE-APACHE LICENSE-MIT +%{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}+owning_ref-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+owning_ref-devel %{_description} This package contains library source intended for building other packages -which use %{crate} from crates.io. +which use "owning_ref" feature of "%{crate}" crate. + +%files -n %{name}+owning_ref-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -p1 @@ -48,15 +79,13 @@ which use %{crate} from crates.io. %if %{with check} %check -# https://github.com/Amanieu/parking_lot/issues/91 -%cargo_test || : +%cargo_test %endif -%files devel -%license LICENSE-APACHE LICENSE-MIT -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sat Oct 27 2018 Igor Gnatenko - 0.1.4-3 +- Adapt to new packaging + * Sun Oct 07 2018 Igor Gnatenko - 0.1.4-2 - Run tests in infrastructure