public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Neal Gompa <ngompa@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-release] f45: Use new build conditional syntax to simplify variant conditionals
Date: Mon, 10 Aug 2026 09:36:36 GMT [thread overview]
Message-ID: <178635459611.1.9276971338779620450.rpms-fedora-release-69c7b733bf6e@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedora-release
Branch : f45
Commit : 69c7b733bf6eb4f55f09236f72f860b0f1a15fb6
Author : Neal Gompa <ngompa@fedoraproject.org>
Date : 2024-08-04T07:07:57-04:00
Stats : +28/-59 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-release/c/69c7b733bf6eb4f55f09236f72f860b0f1a15fb6?branch=f45
Log:
Use new build conditional syntax to simplify variant conditionals
With this new syntax, we can just have a single bcond expression
that switches on or off variants based on whether the target is ELN
or not. This makes it easier to not make a mistake when adding new
variants.
---
diff --git a/fedora-release.spec b/fedora-release.spec
index 6c6f3b6..724ead3 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -21,65 +21,34 @@
%define doc_version f%{dist_version}
%endif
-%if 0%{?eln}
-%bcond_with basic
-%bcond_with cinnamon
-%bcond_with cloud
-%bcond_with compneuro
-%bcond_with container
-%bcond_with coreos
-%bcond_with designsuite
-%bcond_without eln
-%bcond_with iot
-%bcond_with kde
-%bcond_with kde_mobile
-%bcond_with matecompiz
-%bcond_with server
-%bcond_with silverblue
-%bcond_with kinoite
-%bcond_with kinoite_mobile
-%bcond_with snappy
-%bcond_with soas
-%bcond_with toolbx
-%bcond_with workstation
-%bcond_with xfce
-%bcond_with i3
-%bcond_with lxqt
-%bcond_with budgie
-%bcond_with budgie_atomic
-%bcond_with sway
-%bcond_with sway_atomic
-%bcond_with mobility
-%else
-%bcond_without basic
-%bcond_without cinnamon
-%bcond_without cloud
-%bcond_without compneuro
-%bcond_without container
-%bcond_without coreos
-%bcond_without designsuite
-%bcond_with eln
-%bcond_without iot
-%bcond_without kde
-%bcond_without kde_mobile
-%bcond_without matecompiz
-%bcond_without server
-%bcond_without silverblue
-%bcond_without kinoite
-%bcond_without kinoite_mobile
-%bcond_without snappy
-%bcond_without soas
-%bcond_without toolbx
-%bcond_without workstation
-%bcond_without xfce
-%bcond_without i3
-%bcond_without lxqt
-%bcond_without budgie
-%bcond_without budgie_atomic
-%bcond_without sway
-%bcond_without sway_atomic
-%bcond_without mobility
-%endif
+%bcond basic %[%{undefined eln}]
+%bcond cinnamon %[%{undefined eln}]
+%bcond cloud %[%{undefined eln}]
+%bcond compneuro %[%{undefined eln}]
+%bcond container %[%{undefined eln}]
+%bcond coreos %[%{undefined eln}]
+%bcond designsuite %[%{undefined eln}]
+%bcond eln %[%{defined eln}]
+%bcond iot %[%{undefined eln}]
+%bcond kde %[%{undefined eln}]
+%bcond kde_mobile %[%{undefined eln}]
+%bcond matecompiz %[%{undefined eln}]
+%bcond server %[%{undefined eln}]
+%bcond silverblue %[%{undefined eln}]
+%bcond kinoite %[%{undefined eln}]
+%bcond kinoite_mobile %[%{undefined eln}]
+%bcond snappy %[%{undefined eln}]
+%bcond soas %[%{undefined eln}]
+%bcond toolbx %[%{undefined eln}]
+%bcond workstation %[%{undefined eln}]
+%bcond xfce %[%{undefined eln}]
+%bcond i3 %[%{undefined eln}]
+%bcond lxqt %[%{undefined eln}]
+%bcond budgie %[%{undefined eln}]
+%bcond budgie_atomic %[%{undefined eln}]
+%bcond sway %[%{undefined eln}]
+%bcond sway_atomic %[%{undefined eln}]
+%bcond mobility %[%{undefined eln}]
%if %{with silverblue} || %{with kinoite} || %{with kinoite_mobile} || %{with sway_atomic} || %{with budgie_atomic}
%global with_ostree_desktop 1
reply other threads:[~2026-08-10 9:36 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=178635459611.1.9276971338779620450.rpms-fedora-release-69c7b733bf6e@fedoraproject.org \
--to=ngompa@fedoraproject.org \
--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