From 4ec0f9a4d9f6d5eb7771dd13eec8decb5c1d9eca Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 10 Oct 2024 11:30:20 +0200 Subject: [PATCH] Change the pyp2spec invocation pyp2spec 0.10.0 changed the API around the specfile generation. For fully-automated environments as copr is, the automode newly includes convenient defaults to make the specfiles as close to buildability as possible. --- rpmbuild/copr-rpmbuild.spec | 4 ++-- rpmbuild/copr_rpmbuild/providers/pypi.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpmbuild/copr-rpmbuild.spec b/rpmbuild/copr-rpmbuild.spec index df50fcb67..5984f5eec 100644 --- a/rpmbuild/copr-rpmbuild.spec +++ b/rpmbuild/copr-rpmbuild.spec @@ -84,7 +84,7 @@ Recommends: dist-git-client Suggests: tito Suggests: rubygem-gem2rpm Suggests: pyp2rpm -Suggests: pyp2spec +Suggests: pyp2spec >= 0.10.0 %endif %description @@ -117,7 +117,7 @@ Requires: podman # not supported %else Requires: pyp2rpm -Requires: pyp2spec +Requires: pyp2spec >= 0.10.0 Requires: rubygem-gem2rpm Requires: scl-utils-build Requires: fedora-review >= 0.8 diff --git a/rpmbuild/copr_rpmbuild/providers/pypi.py b/rpmbuild/copr_rpmbuild/providers/pypi.py index 45874c667..47cdb4bee 100644 --- a/rpmbuild/copr_rpmbuild/providers/pypi.py +++ b/rpmbuild/copr_rpmbuild/providers/pypi.py @@ -56,7 +56,7 @@ def _produce_srpm_pyp2spec(self): "pyp2spec", self.pypi_package_name, "--fedora-compliant", - "--top-level", + "--automode", ] if self.pypi_package_version: cmd += ["-v", self.pypi_package_version]