public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Aleksei Bavshin <alebastr@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-release] f45: Introduce %with_ostree_desktop macro.
Date: Mon, 10 Aug 2026 09:35:56 GMT [thread overview]
Message-ID: <178635455659.1.5038697719937887950.rpms-fedora-release-1b1d57869cce@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedora-release
Branch : f45
Commit : 1b1d57869ccee69a2687adb3a8f5d81825238ecb
Author : Aleksei Bavshin <alebastr@fedoraproject.org>
Date : 2023-01-09T18:08:54+00:00
Stats : +8/-4 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-release/c/1b1d57869ccee69a2687adb3a8f5d81825238ecb?branch=f45
Log:
Introduce %with_ostree_desktop macro.
The macro is added to avoid listing all ostree desktop editions.
At 2 it was fine, at 3 it gets tedious, if we add more variants it'll
become unmaintainable.
---
diff --git a/fedora-release.spec b/fedora-release.spec
index 58b6e76..e4b5c76 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -64,6 +64,10 @@
%bcond_without sway
%endif
+%if %{with silverblue} || %{with kinoite}
+%global with_ostree_desktop 1
+%endif
+
%global dist %{?eln:.eln%{eln}}
# Changes should be submitted as pull requests under
@@ -668,7 +672,7 @@ itself as Fedora Kinoite.
%endif
-%if %{with silverblue} || %{with kinoite}
+%if %{with ostree_desktop}
%package ostree-desktop
Summary: Configuration package for rpm-ostree variants to add rpm-ostree polkit rules
@@ -1283,12 +1287,12 @@ install -Dm0644 %{SOURCE26} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -Dm0644 %{SOURCE27} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
%endif
-%if %{with silverblue} || %{with kinoite}
+%if %{with ostree_desktop}
# Install rpm-ostree polkit rules
install -Dm0644 %{SOURCE17} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%endif
-%if %{with iot} || %{with silverblue} || %{with kinoite}
+%if %{with iot} || %{with ostree_desktop}
# Statically enable rpm-ostree-countme timer
install -dm0755 %{buildroot}%{_unitdir}/timers.target.wants/
ln -snf %{_unitdir}/rpm-ostree-countme.timer %{buildroot}%{_unitdir}/timers.target.wants/
@@ -1545,7 +1549,7 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
%endif
-%if %{with silverblue} || %{with kinoite}
+%if %{with ostree_desktop}
%files ostree-desktop
%attr(0644,root,root) %{_prefix}/share/polkit-1/rules.d/org.projectatomic.rpmostree1.rules
%endif
reply other threads:[~2026-08-10 9:35 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=178635455659.1.5038697719937887950.rpms-fedora-release-1b1d57869cce@fedoraproject.org \
--to=alebastr@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