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: Add Fedora COSMIC variants
Date: Mon, 10 Aug 2026 09:36:43 GMT	[thread overview]
Message-ID: <178635460309.1.1942807228866115234.rpms-fedora-release-3103e02b2229@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 3103e02b2229ab67bdfba89b1abd158bdd2e4425
            Author : Neal Gompa <ngompa@fedoraproject.org>
            Date   : 2025-01-09T18:55:41-05:00
            Stats  : +120/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/3103e02b2229ab67bdfba89b1abd158bdd2e4425?branch=f45

            Log:
            Add Fedora COSMIC variants

Reference: https://fedoraproject.org/wiki/Changes/FedoraCOSMIC

Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>

---
diff --git a/fedora-cosmic.conf b/fedora-cosmic.conf
new file mode 100644
index 0000000..eb83bf6
--- /dev/null
+++ b/fedora-cosmic.conf
@@ -0,0 +1 @@
+cosmic-session

diff --git a/fedora-release.spec b/fedora-release.spec
index 7d8533f..d378fd7 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -56,8 +56,10 @@
 %bcond mobility %[%{undefined eln}]
 %bcond miraclewm %[%{undefined eln}]
 %bcond miraclewm_atomic %[%{undefined eln}]
+%bcond cosmic %[%{undefined eln}]
+%bcond cosmic_atomic %[%{undefined eln}]
 
-%if %{with silverblue} || %{with kinoite} || %{with kinoite_mobile} || %{with sway_atomic} || %{with budgie_atomic} || %{with miraclewm_atomic}
+%if %{with silverblue} || %{with kinoite} || %{with kinoite_mobile} || %{with sway_atomic} || %{with budgie_atomic} || %{with miraclewm_atomic} || %{with cosmic_atomic}
 %global with_ostree_desktop 1
 %endif
 
@@ -104,6 +106,7 @@ Source32:       75-eln.preset
 Source33:       plasma-mobile.conf
 Source34:       80-kde-mobile.preset
 Source35:       fedora-miraclewm.conf
+Source36:       fedora-cosmic.conf
 
 BuildArch:      noarch
 
@@ -1369,6 +1372,81 @@ Provides the necessary files for a Fedora installation that is identifying
 itself as Fedora Miracle Window Manager Atomic.
 %endif
 
+
+%if %{with cosmic}
+%package cosmic
+Summary:        Base package for Fedora COSMIC specific default configurations
+
+RemovePathPostfixes: .cosmic
+Provides:       fedora-release = %{version}-%{release}
+Provides:       fedora-release-variant = %{version}-%{release}
+Provides:       system-release
+Provides:       system-release(%{version})
+Requires:       fedora-release-common = %{version}-%{release}
+
+# fedora-release-common Requires: fedora-release-identity, so at least one
+# package must provide it. This Recommends: pulls in
+# fedora-release-identity-cosmic if nothing else is already doing so.
+Recommends:     fedora-release-identity-cosmic
+
+
+%description cosmic
+Provides a base package for Fedora COSMIC specific configuration
+files to depend on.
+
+
+%package identity-cosmic
+Summary:        Package providing the identity for Fedora COSMIC Spin
+
+RemovePathPostfixes: .cosmic
+Provides:       fedora-release-identity = %{version}-%{release}
+Conflicts:      fedora-release-identity
+Requires(meta): fedora-release-cosmic = %{version}-%{release}
+
+
+%description identity-cosmic
+Provides the necessary files for a Fedora installation that is identifying
+itself as Fedora COSMIC.
+%endif
+
+
+%if %{with cosmic_atomic}
+%package cosmic-atomic
+Summary:        Base package for Fedora COSMIC Atomic specific default configurations
+
+RemovePathPostfixes: .cosmic-atomic
+Provides:       fedora-release = %{version}-%{release}
+Provides:       fedora-release-variant = %{version}-%{release}
+Provides:       system-release
+Provides:       system-release(%{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-cosmic-atomic if nothing else is already doing so.
+Recommends:     fedora-release-identity-cosmic-atomic
+
+
+%description cosmic-atomic
+Provides a base package for Fedora COSMIC Atomic specific
+configuration files to depend on.
+
+
+%package identity-cosmic-atomic
+Summary:        Package providing the identity for Fedora COSMIC Atomic
+
+RemovePathPostfixes: .cosmic-atomic
+Provides:       fedora-release-identity = %{version}-%{release}
+Conflicts:      fedora-release-identity
+Requires(meta): fedora-release-cosmic-atomic = %{version}-%{release}
+
+
+%description identity-cosmic-atomic
+Provides the necessary files for a Fedora installation that is identifying
+itself as Fedora COSMIC Atomic.
+%endif
+
 %prep
 mkdir -p licenses
 sed 's|@@VERSION@@|%{dist_version}|g' %{SOURCE2} >licenses/Fedora-Legal-README.txt
@@ -1850,6 +1928,27 @@ sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-miracle/
 sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/MiracleWMAtomic/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.miraclewm-atomic
 %endif
 
+%if %{with cosmic}
+cp -p os-release %{buildroot}%{_prefix}/lib/os-release.cosmic
+echo "VARIANT=\"COSMIC\"" >> %{buildroot}%{_prefix}/lib/os-release.cosmic
+echo "VARIANT_ID=cosmic" >> %{buildroot}%{_prefix}/lib/os-release.cosmic
+sed -i -e "s|(%{release_name}%{?prerelease})|(COSMIC%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.cosmic
+sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-cosmic/SIG/issues"|' %{buildroot}/%{_prefix}/lib/os-release.cosmic
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/COSMIC/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cosmic
+# Add Fedora COSMIC dnf protected packages list
+install -Dm0644 %{SOURCE36} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
+%endif
+
+%if %{with cosmic_atomic}
+cp -p os-release %{buildroot}%{_prefix}/lib/os-release.cosmic-atomic
+echo "VARIANT=\"COSMIC Atomic\"" >> %{buildroot}%{_prefix}/lib/os-release.cosmic-atomic
+echo "VARIANT_ID=cosmic-atomic" >> %{buildroot}%{_prefix}/lib/os-release.cosmic-atomic
+sed -i -e "s|(%{release_name}%{?prerelease})|(COSMIC Atomic%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.cosmic-atomic
+sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/atomic-desktops/cosmic/"|' %{buildroot}/%{_prefix}/lib/os-release.cosmic-atomic
+sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-cosmic/SIG/issues"|' %{buildroot}/%{_prefix}/lib/os-release.cosmic-atomic
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/COSMICAtomic/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cosmic-atomic
+%endif
+
 # Create the symlink for /etc/os-release
 ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
 
@@ -2223,5 +2322,24 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
 %endif
 
 
+%if %{with cosmic}
+%files cosmic
+%files identity-cosmic
+%{_prefix}/lib/os-release.cosmic
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cosmic
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
+%{_sysconfdir}/dnf/protected.d/fedora-cosmic.conf
+%endif
+
+
+%if %{with cosmic_atomic}
+%files cosmic-atomic
+%files identity-cosmic-atomic
+%{_prefix}/lib/os-release.cosmic-atomic
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cosmic-atomic
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
+%endif
+
+
 %changelog
 %autochangelog

                 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=178635460309.1.1942807228866115234.rpms-fedora-release-3103e02b2229@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