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: Rename Fedora KDE Plasma Spin to Fedora KDE Plasma Desktop Edition
Date: Mon, 10 Aug 2026 09:36:49 GMT [thread overview]
Message-ID: <178635460909.1.17031297377335318024.rpms-fedora-release-3124b83807c7@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedora-release
Branch : f45
Commit : 3124b83807c7aa5b28e32b0c7ed66e40c7103464
Author : Neal Gompa <ngompa@fedoraproject.org>
Date : 2025-04-03T15:55:27-04:00
Stats : +37/-32 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-release/c/3124b83807c7aa5b28e32b0c7ed66e40c7103464?branch=f45
Log:
Rename Fedora KDE Plasma Spin to Fedora KDE Plasma Desktop Edition
Reference: https://fedoraproject.org/wiki/Changes/Promote_KDE_Plasma_Desktop_variant_to_Edition
Resolves: rhbz#2357258
Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
---
diff --git a/80-kde-desktop.preset b/80-kde-desktop.preset
new file mode 100644
index 0000000..de70858
--- /dev/null
+++ b/80-kde-desktop.preset
@@ -0,0 +1 @@
+# Fedora KDE Spin & Kinoite specific configuration
diff --git a/80-kde.preset b/80-kde.preset
deleted file mode 100644
index de70858..0000000
--- a/80-kde.preset
+++ /dev/null
@@ -1 +0,0 @@
-# Fedora KDE Spin & Kinoite specific configuration
diff --git a/fedora-release.spec b/fedora-release.spec
index ac8f76d..213ffcb 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -35,7 +35,7 @@
%bcond eln %[%{defined eln}]
%bcond flatpak %[%{undefined eln}]
%bcond iot %[%{undefined eln}]
-%bcond kde %[%{undefined eln}]
+%bcond kde_desktop %[%{undefined eln}]
%bcond kde_mobile %[%{undefined eln}]
%bcond matecompiz %[%{undefined eln}]
%bcond server %[%{undefined eln}]
@@ -97,7 +97,7 @@ Source22: 80-coreos.preset
Source23: zezere-ignition-url
Source24: 80-iot-user.preset
Source25: plasma-desktop.conf
-Source26: 80-kde.preset
+Source26: 80-kde-desktop.preset
Source27: 81-desktop.preset
Source28: longer-default-shutdown-timeout.conf
Source29: org.gnome.settings-daemon.plugins.power.gschema.override
@@ -589,11 +589,13 @@ itself as Fedora IoT Edition.
%endif
-%if %{with kde}
-%package kde
-Summary: Base package for Fedora KDE Plasma-specific default configurations
+%if %{with kde_desktop}
+%package kde-desktop
+Summary: Base package for Fedora KDE Plasma Desktop-specific default configurations
-RemovePathPostfixes: .kde
+RemovePathPostfixes: .kde-desktop
+Obsoletes: %{name}-kde < 43-0.9
+Provides: %{name}-kde = %{version}-%{release}
Provides: fedora-release = %{version}-%{release}
Provides: fedora-release-variant = %{version}-%{release}
Provides: system-release
@@ -603,26 +605,28 @@ 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-kde if nothing else is already doing so.
-Recommends: fedora-release-identity-kde
+Recommends: fedora-release-identity-kde-desktop
-%description kde
-Provides a base package for Fedora KDE Plasma-specific configuration files to
-depend on as well as KDE Plasma system defaults.
+%description kde-desktop
+Provides a base package for Fedora KDE Plasma Desktop-specific configuration
+files to depend on as well as KDE Plasma Desktop system defaults.
-%package identity-kde
-Summary: Package providing the identity for Fedora KDE Plasma Spin
+%package identity-kde-desktop
+Summary: Package providing the identity for Fedora KDE Plasma Desktop Edition
-RemovePathPostfixes: .kde
+RemovePathPostfixes: .kde-desktop
+Obsoletes: %{name}-identity-kde < 43-0.9
+Provides: %{name}-identity-kde = %{version}-%{release}
Provides: fedora-release-identity = %{version}-%{release}
Conflicts: fedora-release-identity
-Requires(meta): fedora-release-kde = %{version}-%{release}
+Requires(meta): fedora-release-kde-desktop = %{version}-%{release}
-%description identity-kde
+%description identity-kde-desktop
Provides the necessary files for a Fedora installation that is identifying
-itself as Fedora KDE Plasma Spin.
+itself as Fedora KDE Plasma Desktop Edition.
%endif
%if %{with kde_mobile}
@@ -1709,15 +1713,16 @@ install -Dm0644 %{SOURCE18} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -Dm0644 %{SOURCE24} -t %{buildroot}%{_prefix}/lib/systemd/user-preset/
%endif
-%if %{with kde}
-# KDE Plasma
+%if %{with kde_desktop}
+# KDE Plasma Desktop
cp -p os-release \
- %{buildroot}%{_prefix}/lib/os-release.kde
-echo "VARIANT=\"KDE Plasma\"" >> %{buildroot}%{_prefix}/lib/os-release.kde
-echo "VARIANT_ID=kde" >> %{buildroot}%{_prefix}/lib/os-release.kde
-sed -i -e "s|(%{release_name}%{?prerelease})|(KDE Plasma%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.kde
-sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/KDE/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde
-# Add plasma-desktop to dnf protected packages list for KDE
+ %{buildroot}%{_prefix}/lib/os-release.kde-desktop
+echo "VARIANT=\"KDE Plasma Desktop Edition\"" >> %{buildroot}%{_prefix}/lib/os-release.kde-desktop
+# kept as-is from the spin to prevent third-party stuff from breaking
+echo "VARIANT_ID=kde" >> %{buildroot}%{_prefix}/lib/os-release.kde-desktop
+sed -i -e "s|(%{release_name}%{?prerelease})|(KDE Plasma%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.kde-desktop
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/KDE Desktop/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde-desktop
+# Add plasma-desktop to dnf protected packages list for KDE Desktop
install -Dm0644 %{SOURCE25} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
%endif
@@ -1847,7 +1852,7 @@ install -Dm0644 %{SOURCE27} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -Dm0644 %{SOURCE16} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
%endif
-%if %{with kde} || %{with kinoite}
+%if %{with kde_desktop} || %{with kinoite}
# Common desktop preset and spin specific preset
install -Dm0644 %{SOURCE26} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -Dm0644 %{SOURCE27} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
@@ -2162,13 +2167,13 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
%endif
-%if %{with kde}
-%files kde
-%files identity-kde
-%{_prefix}/lib/os-release.kde
-%{_prefix}/lib/systemd/system-preset/80-kde.preset
+%if %{with kde_desktop}
+%files kde-desktop
+%files identity-kde-desktop
+%{_prefix}/lib/os-release.kde-desktop
+%{_prefix}/lib/systemd/system-preset/80-kde-desktop.preset
%{_prefix}/lib/systemd/system-preset/81-desktop.preset
-%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde-desktop
%{_sysconfdir}/dnf/protected.d/plasma-desktop.conf
%endif
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=178635460909.1.17031297377335318024.rpms-fedora-release-3124b83807c7@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