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/fedora-release] f45: Add flatpak variant
Date: Mon, 10 Aug 2026 09:36:42 GMT	[thread overview]
Message-ID: <178635460264.1.7322922983390092652.rpms-fedora-release-c9e60d11c5b3@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : c9e60d11c5b381a996aafde05419dc1614ea0cfe
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2024-12-25T22:16:46-05:00
            Stats  : +65/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/c9e60d11c5b381a996aafde05419dc1614ea0cfe?branch=f45

            Log:
            Add flatpak variant

This is intended to be included in Fedora Flatpak runtimes in place of the
generic files.

---
diff --git a/fedora-release.spec b/fedora-release.spec
index de4a0a6..7d8533f 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -33,6 +33,7 @@
 %bcond coreos %[%{undefined eln}]
 %bcond designsuite %[%{undefined eln}]
 %bcond eln %[%{defined eln}]
+%bcond flatpak %[%{undefined eln}]
 %bcond iot %[%{undefined eln}]
 %bcond kde %[%{undefined eln}]
 %bcond kde_mobile %[%{undefined eln}]
@@ -504,6 +505,48 @@ itself as Fedora ELN.
 %endif
 
 
+%if %{with flatpak}
+%package flatpak
+Summary:        Base package for Fedora flatpak specific default configurations
+
+RemovePathPostfixes: .flatpak
+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-flatpak if nothing else is already doing so.
+Recommends:     fedora-release-identity-flatpak
+
+
+%description flatpak
+Provides a base package for Fedora flatpak specific configuration files to
+depend on as well as flatpak system defaults.
+
+
+%package identity-flatpak
+Summary:        Package providing the identity for Fedora Flatpak Runtime Image
+
+RemovePathPostfixes: .flatpak
+Provides:       fedora-release-identity = %{version}-%{release}
+Conflicts:      fedora-release-identity
+Requires(meta): fedora-release-flatpak = %{version}-%{release}
+
+# gnuplot requires qt6, gnuplot-wx requires gtk3 (available in all runtimes)
+Suggests:       (gnuplot if qt6-qtbase else gnuplot-wx)
+# default backend included in runtime
+Suggests:       qt6-qtspeech-speechd
+
+
+%description identity-flatpak
+Provides the necessary files for a Fedora installation that is identifying
+itself as the Fedora Flatpak Runtime Image.
+%endif
+
+
 %if %{with iot}
 %package iot
 Summary:        Base package for Fedora IoT specific default configurations
@@ -1523,6 +1566,20 @@ install -Dm0644 %{SOURCE14} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
 install -Dm0644 %{SOURCE32} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
 %endif
 
+%if %{with flatpak}
+# Flatpak
+cp -p os-release \
+      %{buildroot}%{_prefix}/lib/os-release.flatpak
+echo "VARIANT=\"Flatpak runtime\"" >> %{buildroot}%{_prefix}/lib/os-release.flatpak
+echo "VARIANT_ID=flatpak" >> %{buildroot}%{_prefix}/lib/os-release.flatpak
+sed -i -e "s|(%{release_name}%{?prerelease})|(Flatpak runtime%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.flatpak
+sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/flatpak/"|' %{buildroot}%{_prefix}/lib/os-release.flatpak
+sed -i -e 's|SUPPORT_URL=.*|SUPPORT_URL="https://gitlab.com/fedora/sigs/flatpak/fedora-flatpaks/-/issues"|' %{buildroot}/%{_prefix}/lib/os-release.flatpak
+sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/flatpak/fedora-flatpaks/-/issues"|' %{buildroot}/%{_prefix}/lib/os-release.flatpak
+sed -i -e 's|PRETTY_NAME=.*|PRETTY_NAME="Fedora %{dist_version} (Flatpak runtime)"|' %{buildroot}/%{_prefix}/lib/os-release.flatpak
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Flatpak/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.flatpak
+%endif
+
 %if %{with iot}
 # IoT
 cp -p os-release \
@@ -1942,6 +1999,14 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
 %endif
 
 
+%if %{with flatpak}
+%files flatpak
+%files identity-flatpak
+%{_prefix}/lib/os-release.flatpak
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.flatpak
+%endif
+
+
 %if %{with iot}
 %files iot
 %files identity-iot

                 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=178635460264.1.7322922983390092652.rpms-fedora-release-c9e60d11c5b3@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