summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParide Legovini <paride.legovini@canonical.com>2020-08-27 16:37:14 +0200
committerGitHub <noreply@github.com>2020-08-27 09:37:14 -0500
commit575750ac4a3abb6fdfa45e2cc65186df291d8ddf (patch)
treeeaa83122b410f93461504a7471faf4f32972c223
parent371b392ced518e45be51089b6a67b362957b1dba (diff)
downloadvyos-cloud-init-575750ac4a3abb6fdfa45e2cc65186df291d8ddf.tar.gz
vyos-cloud-init-575750ac4a3abb6fdfa45e2cc65186df291d8ddf.zip
redhat spec: add missing BuildRequires (#552)
456fb55744a1acc6bd2f464b7656a9c33d0b7ac5 made tools/read-dependencies and package/brpm distinguish between build dependencies and runtime dependencies, however packages/redhat/cloud-init.spec.in expects all the dependencies to be in the 'requires' list, thus missing some build dependencies. This change makes cloud-init.spec use 'buildrequires' too. The build happens to succeed without python3-devel on the epel-8 copr chroot as it pulls in the epel-rpm-macros package, which in turn depends on python3-devel. In other words the dependency is satisfied by chance. Packages building for Python 3 need to explicitly specify BuildRequires: python3-devel, see: [1]. [1] https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/
-rw-r--r--packages/redhat/cloud-init.spec.in9
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 4cff2c97..16138012 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -39,10 +39,7 @@ Requires(post): chkconfig
Requires(preun): chkconfig
%endif
-# These are runtime dependencies, but declared as BuildRequires so that
-# - tests can be run here.
-# - parts of cloud-init such (setup.py) use these dependencies.
-{% for r in requires %}
+{% for r in buildrequires %}
BuildRequires: {{r}}
{% endfor %}
@@ -57,8 +54,10 @@ Requires: python-argparse
%endif
-# Install 'dynamic' runtime reqs from *requirements.txt and pkg-deps.json
+# Install 'dynamic' runtime reqs from *requirements.txt and pkg-deps.json.
+# Install them as BuildRequires too as they're used for testing.
{% for r in requires %}
+BuildRequires: {{r}}
Requires: {{r}}
{% endfor %}