From c28b58679db5bd1910f1edc87c2c0c0231805cd4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 26 Oct 2018 20:57:20 +0200 Subject: [PATCH] trivial fixes to last patchset Signed-off-by: Igor Gnatenko --- 0007-split-features-into-subpackages.patch | 8 ++++---- rust-packaging.spec | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/0007-split-features-into-subpackages.patch b/0007-split-features-into-subpackages.patch index 58e5e8d..79909ab 100644 --- a/0007-split-features-into-subpackages.patch +++ b/0007-split-features-into-subpackages.patch @@ -1,4 +1,4 @@ -From 83a9b92d68e8c5d6f2ab75b287be7ea69275fb90 Mon Sep 17 00:00:00 2001 +From 571ba6b1f2a886b40a7de76980cd8c479015cc9e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 26 Oct 2018 11:20:13 +0200 Subject: [PATCH 7/7] split features into subpackages @@ -512,7 +512,7 @@ index 5adeb65..95aa142 100644 +def normalize_deps(deps): + return set().union(*(d.normalize() for d in deps)) diff --git a/rust2rpm/templates/main.spec b/rust2rpm/templates/main.spec -index 7dbcc3f..4acfab7 100644 +index 7dbcc3f..27a448f 100644 --- a/rust2rpm/templates/main.spec +++ b/rust2rpm/templates/main.spec @@ -48,82 +48,101 @@ Patch0: {{ patch_file }} @@ -613,7 +613,7 @@ index 7dbcc3f..4acfab7 100644 -{% endif %} -{% if include_requires %} + {% if include_provides %} -+Provides: {{ md.provides() }} ++Provides: {{ md.provides(feature) }} + {% endif %} + {% if include_requires %} Requires: cargo @@ -644,7 +644,7 @@ index 7dbcc3f..4acfab7 100644 This package contains library source intended for building other packages -which use %{crate} from crates.io. -+which use {% if feature is not none %}"{{ feature }}" of {% endif %}"%{crate}" crate. ++which use {% if feature is not none %}"{{ feature }}" feature of {% endif %}"%{crate}" crate. + +%files {{ pkg }} + {% if feature is none %} diff --git a/rust-packaging.spec b/rust-packaging.spec index a7ba418..e206b06 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -4,7 +4,7 @@ Name: rust-packaging Version: 6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: RPM macros for building Rust packages on various architectures License: MIT @@ -79,6 +79,9 @@ py.test-%{python3_version} -vv test.py %{python3_sitelib}/rust2rpm/ %changelog +* Fri Oct 26 2018 Igor Gnatenko - 6-11 +- Trivial fixes to last patchset + * Fri Oct 26 2018 Igor Gnatenko - 6-10 - Split features into subpackages