public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fedora-release] f45: Add Fedora Onyx immutable variant.
@ 2026-08-10  9:36 Joshua Strobl
  0 siblings, 0 replies; only message in thread
From: Joshua Strobl @ 2026-08-10  9:36 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 82732bc72d33e4fc64383289574caef68e65d640
            Author : Joshua Strobl <me@joshuastrobl.com>
            Date   : 2023-05-02T21:37:45+03:00
            Stats  : +60/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/82732bc72d33e4fc64383289574caef68e65d640?branch=f45

            Log:
            Add Fedora Onyx immutable variant.

Change Proposal: https://fedoraproject.org/wiki/Changes/Fedora_Onyx

Signed-off-by: Joshua Strobl <me@joshuastrobl.com>

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 412d3c7..c721c67 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -40,6 +40,7 @@
 %bcond_with budgie
 %bcond_with sway
 %bcond_with sericea
+%bcond_with onyx
 %bcond_with mobility
 %else
 %bcond_without basic
@@ -65,10 +66,11 @@
 %bcond_without budgie
 %bcond_without sway
 %bcond_without sericea
+%bcond_without onyx
 %bcond_without mobility
 %endif
 
-%if %{with silverblue} || %{with kinoite} || %{with sericea}
+%if %{with silverblue} || %{with kinoite} || %{with sericea} || %{with onyx}
 %global with_ostree_desktop 1
 %endif
 
@@ -1037,6 +1039,44 @@ Provides the necessary files for a Fedora installation that is identifying
 itself as Fedora Sericea.
 %endif
 
+%if %{with onyx}
+%package onyx
+Summary:        Base package for Fedora Onyx specific default configurations
+
+RemovePathPostfixes: .onyx
+Provides:       fedora-release = %{version}-%{release}
+Provides:       fedora-release-variant = %{version}-%{release}
+Provides:       system-release
+Provides:       system-release(%{version})
+Provides:       base-module(platform:f%{version})
+Requires:       fedora-release-common = %{version}-%{release}
+Requires:       fedora-release-ostree-desktop = %{version}-%{release}
+
+# fedora-release-common Requires: fedora-release-identity, so at least one
+# package must provide it. This Recommends: pulls in
+# fedora-release-identity-onyx if nothing else is already doing so.
+Recommends:     fedora-release-identity-onyx
+
+
+%description onyx
+Provides a base package for Fedora Onyx specific configuration
+files to depend on.
+
+
+%package identity-onyx
+Summary:        Package providing the identity for Fedora Onyx
+
+RemovePathPostfixes: .onyx
+Provides:       fedora-release-identity = %{version}-%{release}
+Conflicts:      fedora-release-identity
+Requires(meta): fedora-release-onyx = %{version}-%{release}
+
+
+%description identity-onyx
+Provides the necessary files for a Fedora installation that is identifying
+itself as Fedora Onyx.
+%endif
+
 
 %if %{with mobility}
 %package mobility
@@ -1454,6 +1494,16 @@ sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/sw
 sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Sericea/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sericea
 %endif
 
+%if %{with onyx}
+cp -p os-release %{buildroot}%{_prefix}/lib/os-release.onyx
+echo "VARIANT=\"Onyx\"" >> %{buildroot}%{_prefix}/lib/os-release.onyx
+echo "VARIANT_ID=onyx" >> %{buildroot}%{_prefix}/lib/os-release.onyx
+sed -i -e "s|(%{release_name}%{?prerelease})|(Onyx%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.onyx
+sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora-onyx/"|' %{buildroot}%{_prefix}/lib/os-release.onyx
+sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/onyx/"|' %{buildroot}/%{_prefix}/lib/os-release.onyx
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Onyx/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.onyx
+%endif
+
 %if %{with mobility}
 cp -p os-release %{buildroot}%{_prefix}/lib/os-release.mobility
 echo "VARIANT=\"Mobility\"" >> %{buildroot}%{_prefix}/lib/os-release.mobility
@@ -1751,6 +1801,15 @@ ln -s --relative %{buildroot}%{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swid
 %{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
 %endif
 
+%if %{with onyx}
+%files onyx
+%files identity-onyx
+%{_prefix}/lib/os-release.onyx
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.onyx
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
+%{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
+%endif
+
 
 %if %{with mobility}
 %files mobility

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-10  9:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-10  9:36 [rpms/fedora-release] f45: Add Fedora Onyx immutable variant Joshua Strobl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox