From c910ab0697d367be25661c75f722cfef1084e1ca Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 10 Mar 2019 20:18:12 +0100 Subject: [PATCH] Do not pull optional dependencies Signed-off-by: Igor Gnatenko --- parking_lot_core-fix-metadata.diff | 29 +-------------- rust-parking_lot_core.spec | 59 +++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 32 deletions(-) diff --git a/parking_lot_core-fix-metadata.diff b/parking_lot_core-fix-metadata.diff index 1d6ef88..9473970 100644 --- a/parking_lot_core-fix-metadata.diff +++ b/parking_lot_core-fix-metadata.diff @@ -1,31 +1,6 @@ --- parking_lot_core-0.4.0/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ parking_lot_core-0.4.0/Cargo.toml 2018-12-15T10:00:00.362103+01:00 -@@ -19,31 +19,15 @@ - categories = ["concurrency"] - license = "Apache-2.0/MIT" - repository = "https://github.com/Amanieu/parking_lot" --[dependencies.backtrace] --version = "0.3.2" --optional = true -- --[dependencies.petgraph] --version = "0.4.5" --optional = true -- - [dependencies.rand] - version = "0.6" - - [dependencies.smallvec] - version = "0.6" -- --[dependencies.thread-id] --version = "3.2.0" --optional = true - [build-dependencies.rustc_version] - version = "0.2" - - [features] --deadlock_detection = ["petgraph", "thread-id", "backtrace"] ++++ parking_lot_core-0.4.0/Cargo.toml 2019-03-10T20:19:27.617380+01:00 +@@ -44,6 +44,3 @@ nightly = [] [target."cfg(unix)".dependencies.libc] version = "0.2.27" diff --git a/rust-parking_lot_core.spec b/rust-parking_lot_core.spec index 1c171fc..a7158fa 100644 --- a/rust-parking_lot_core.spec +++ b/rust-parking_lot_core.spec @@ -7,17 +7,15 @@ Name: rust-%{crate} Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced API for creating custom synchronization primitives # Upstream license specification: Apache-2.0/MIT License: ASL 2.0 or MIT URL: https://crates.io/crates/parking_lot_core -Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source: %{crates_source} # Initial patched metadata # * No Windows -# * No nightly -# * Remove deadlock feature, it depends on some unpackaged crates Patch0: parking_lot_core-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -58,8 +56,56 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+backtrace-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+backtrace-devel %{_description} + +This package contains library source intended for building other packages +which use "backtrace" feature of "%{crate}" crate. + +%files -n %{name}+backtrace-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+deadlock_detection-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+deadlock_detection-devel %{_description} + +This package contains library source intended for building other packages +which use "deadlock_detection" feature of "%{crate}" crate. + +%files -n %{name}+deadlock_detection-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+petgraph-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+petgraph-devel %{_description} + +This package contains library source intended for building other packages +which use "petgraph" feature of "%{crate}" crate. + +%files -n %{name}+petgraph-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+thread-id-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+thread-id-devel %{_description} + +This package contains library source intended for building other packages +which use "thread-id" feature of "%{crate}" crate. + +%files -n %{name}+thread-id-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %prep -%autosetup -n %{crate}-%{version} -p1 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep %build @@ -74,6 +120,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Sun Mar 10 2019 Igor Gnatenko - 0.4.0-3 +- Do not pull optional dependencies + * Sat Feb 02 2019 Fedora Release Engineering - 0.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild