From 2736dc0ce240753e28a3a2d5092925317eb8b5fe Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 10 Mar 2019 20:12:00 +0100 Subject: [PATCH] Strip out target dependencies too Signed-off-by: Igor Gnatenko --- 0019-Do-not-pull-optional-dependencies.patch | 6 +++--- rust-packaging.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/0019-Do-not-pull-optional-dependencies.patch b/0019-Do-not-pull-optional-dependencies.patch index 0d746e6..80d715a 100644 --- a/0019-Do-not-pull-optional-dependencies.patch +++ b/0019-Do-not-pull-optional-dependencies.patch @@ -1,4 +1,4 @@ -From 5fbb0558d401c26f04e274b6b1fc5b0ed9d6e4cd Mon Sep 17 00:00:00 2001 +From 72d9afecc6da319e1d59170f07a7b78afbbb1a68 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 9 Mar 2019 22:04:49 +0100 Subject: [PATCH 19/19] Do not pull optional dependencies @@ -10,7 +10,7 @@ Signed-off-by: Igor Gnatenko 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/data/macros.cargo b/data/macros.cargo -index 96dc354..a816578 100644 +index 96dc354..b1a2e0b 100644 --- a/data/macros.cargo +++ b/data/macros.cargo @@ -2,8 +2,10 @@ @@ -33,7 +33,7 @@ index 96dc354..a816578 100644 +# Drop all dependency/features information \ +# so that cargo doesn't fail resolving dependencies: \ +# https://github.com/rust-lang/cargo/pull/6729 \ -+ %{__awk} -i inplace -v INPLACE_SUFFIX=.deps '/^\\\[((dev-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml \ ++ %{__awk} -i inplace -v INPLACE_SUFFIX=.deps '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml \ %{__cargo} package -l | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \ %if ! %{with check} \ %{__cp} -a Cargo.toml.orig $REG_DIR/Cargo.toml \ diff --git a/rust-packaging.spec b/rust-packaging.spec index 2418d1d..f315a93 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -5,7 +5,7 @@ Name: rust-packaging Version: 6 -Release: 25%{?dist} +Release: 26%{?dist} Summary: RPM macros for building Rust packages on various architectures License: MIT @@ -91,6 +91,9 @@ py.test-%{python3_version} -vv test.py %{python3_sitelib}/rust2rpm/ %changelog +* Sun Mar 10 2019 Igor Gnatenko - 6-26 +- Strip out target dependencies too + * Sun Mar 10 2019 Igor Gnatenko - 6-25 - Do not error on removing files which do not exist