public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/python-rpmautospec] rawhide: Build extras without dependencies on ELN
Date: Thu, 03 Sep 2026 09:25:52 GMT	[thread overview]
Message-ID: <178842755215.1.7735590609542099932.rpms-python-rpmautospec-afbd4340b668@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/python-rpmautospec
            Branch : rawhide
            Commit : afbd4340b6680641fa36567b166eee6834fd31ba
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-08-24T04:29:08+00:00
            Stats  : +10/-7 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-rpmautospec/c/afbd4340b6680641fa36567b166eee6834fd31ba?branch=rawhide

            Log:
            Build extras without dependencies on ELN

As we do not yet have separate builds for ELN and ELN Extras, and some
Extras packages require the python3-rpmautospec module, this allows for
both without adding any unwanted build dependencies to ELN proper.

---
diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec
index ee93a39..6541750 100644
--- a/python-rpmautospec.spec
+++ b/python-rpmautospec.spec
@@ -18,13 +18,16 @@
 %bcond xdist %[%{without bootstrap} && %{undefined rhel}]
 
 # Whether to build only the minimal package for RHEL buildroot
-%bcond minimal %[%{defined rhel} && %{undefined epel}]
+%bcond minimal %[%{defined rhel} && %{undefined epel} && %{undefined eln}]
+
+# Whether to build extras with their dependencies
+%bcond extras %[%{undefined rhel} || %{defined epel}]
 
 # While bootstrapping or building the minimal package, ignore manpages
-%bcond manpages %[%{without bootstrap} && %{without minimal}]
+%bcond manpages %[%{without bootstrap} && %{with extras}]
 
 # While building the minimal package, ignore shell completions
-%bcond completions %{without minimal}
+%bcond completions %{with extras}
 
 # Package the placeholder rpm-macros (moved to redhat-rpm-config in F40)
 %if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)
@@ -149,7 +152,7 @@ Requires: this-is-broken-libgit2-missing-during-build
 Requires: rpm-libs
 Requires: rpm-build-libs
 
-%if %{without minimal}
+%if %{with extras}
 Recommends: python3-%{srcname} = %{version}-%{release}
 Recommends: python3-%{srcname}+click = %{version}-%{release}
 Recommends: python3-%{srcname}+pygit2 = %{version}-%{release}
@@ -170,7 +173,7 @@ enabled packages locally.
 %endif
 
 %generate_buildrequires
-%pyproject_buildrequires %{!?with_minimal:-x all}
+%pyproject_buildrequires %{?with_extras:-x all}
 
 %prep
 %autosetup -n %{srcname}-%{version}
@@ -242,10 +245,10 @@ touch -r %{S:1} %{buildroot}%{_bindir}/rpmautospec
 
 %check
 # Always run the import checks, even when other tests are disabled
-%pyproject_check_import %{?with_minimal:-e '*click*'}
+%pyproject_check_import %{!?with_extras:-e '*click*'}
 
 %if %{with tests}
-%if %{without minimal}
+%if %{with extras}
 %pytest \
 %if %{with xdist}
 --numprocesses=auto

                 reply	other threads:[~2026-09-03  9:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178842755215.1.7735590609542099932.rpms-python-rpmautospec-afbd4340b668@fedoraproject.org \
    --to=yselkowi@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox