Generate runtime dependencyon cargo for devel subpackages

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
epel9
Igor Gnatenko 7 years ago
parent 46f705671d
commit 6b81b17f09

@ -0,0 +1,41 @@
From 9e0a872ece6f5aedf76ffd67044f22c7d0cba8aa Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Fri, 20 Oct 2017 18:04:31 +0200
Subject: [PATCH 1/2] inspector: inject cargo dependency in runtime
Fixes: https://pagure.io/fedora-rust/rust2rpm/issue/42
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
rust2rpm/__main__.py | 1 +
rust2rpm/inspector.py | 3 +++
2 files changed, 4 insertions(+)
diff --git a/rust2rpm/__main__.py b/rust2rpm/__main__.py
index 0121a33..bb92fa3 100644
--- a/rust2rpm/__main__.py
+++ b/rust2rpm/__main__.py
@@ -91,6 +91,7 @@ Provides: {{ prv }}
{% endfor %}
{% endif %}
{% if include_requires %}
+Requires: cargo
{% if md.requires|length > 0 %}
# [dependencies]
{% for req in md.requires|sort(attribute="name") %}
diff --git a/rust2rpm/inspector.py b/rust2rpm/inspector.py
index d08f1aa..6ccdbc2 100644
--- a/rust2rpm/inspector.py
+++ b/rust2rpm/inspector.py
@@ -38,6 +38,9 @@ def main():
print_deps(list(itertools.chain(md.requires, md.build_requires)))
if args.test_requires:
print_deps(md.test_requires)
+ if args.requires:
+ # Someone should own /usr/share/cargo/registry
+ print("cargo")
if __name__ == "__main__":
main()
--
2.14.2

@ -0,0 +1,28 @@
From 45a5caf30060c182fb0ae03a1a7e4e707599aaa3 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 21 Oct 2017 09:45:30 +0200
Subject: [PATCH 2/2] inspector: inject rust-packaging dependency in buildtime
For consistency with previous commit.
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
rust2rpm/inspector.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rust2rpm/inspector.py b/rust2rpm/inspector.py
index 6ccdbc2..2d488b2 100644
--- a/rust2rpm/inspector.py
+++ b/rust2rpm/inspector.py
@@ -41,6 +41,8 @@ def main():
if args.requires:
# Someone should own /usr/share/cargo/registry
print("cargo")
+ if args.build_requires:
+ print("rust-packaging")
if __name__ == "__main__":
main()
--
2.14.2

@ -2,12 +2,15 @@
Name: rust-packaging
Version: 4
Release: 3%{?dist}
Release: 5%{?dist}
Summary: RPM macros for building Rust packages on various architectures
License: MIT
URL: https://pagure.io/fedora-rust/rust2rpm
Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz
# https://pagure.io/fedora-rust/rust2rpm/pull-request/43
Patch0001: 0001-inspector-inject-cargo-dependency-in-runtime.patch
Patch0002: 0002-inspector-inject-rust-packaging-dependency-in-buildt.patch
BuildArch: noarch
ExclusiveArch: %{rust_arches} noarch
@ -83,6 +86,9 @@ py.test-%{python3_version} -v test.py
%{python3_sitelib}/rust2rpm/
%changelog
* Sat Oct 21 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4-5
- Generate runtime dependencyon cargo for devel subpackages
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

Loading…
Cancel
Save