From 9d3869c3408529507f7902b2b2903f0de9edf4a3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 11 Mar 2019 00:09:20 +0100 Subject: [PATCH] Install $PWD/Cargo.toml into $REG_DIR/Cargo.toml For things which are just including files, deps one doesn't get installed into the registry. 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 5b8a70e..814c920 100644 --- a/0019-Do-not-pull-optional-dependencies.patch +++ b/0019-Do-not-pull-optional-dependencies.patch @@ -1,4 +1,4 @@ -From 643bf0d32982b67854a39586244b25f54518de02 Mon Sep 17 00:00:00 2001 +From 604938a8bab778c58333643c3e069533327699e2 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(+), 14 deletions(-) diff --git a/data/macros.cargo b/data/macros.cargo -index 96dc354..f950e79 100644 +index 96dc354..999d787 100644 --- a/data/macros.cargo +++ b/data/macros.cargo @@ -2,8 +2,10 @@ @@ -50,7 +50,7 @@ index 96dc354..f950e79 100644 - %{__cp} -a Cargo.toml.orig $REG_DIR/Cargo.toml \ -%endif \ + %{__mv} Cargo.toml{.deps,} \ -+ %{__mv} $REG_DIR/Cargo.toml{.deps,} \ ++ %{__cp} -a Cargo.toml $REG_DIR/Cargo.toml \ + %{__rm} -f $REG_DIR/Cargo.toml.orig \ echo '{"files":{},"package":""}' > $REG_DIR/.cargo-checksum.json \ fi \ diff --git a/rust-packaging.spec b/rust-packaging.spec index 0ea39e1..7412fdf 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -5,7 +5,7 @@ Name: rust-packaging Version: 6 -Release: 27%{?dist} +Release: 28%{?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-28 +- Install $PWD/Cargo.toml into $REG_DIR/Cargo.toml + * Sun Mar 10 2019 Igor Gnatenko - 6-27 - Restore Cargo.toml.deps into $PWD/Cargo.toml