fix

2026-03-16 18:14:05 +08:00
parent 12c3ee6f38
commit 1a098c8610
17 changed files with 48 additions and 49 deletions
--- a/1.md
+++ b/1.md
@@ -217,7 +217,7 @@ libmtp
 - [ ] plasma6-activities
 - [ ] plasma6-activities-stats
 - [ ] plasma6-browser-integration
- [ ] plasma6-desktop
+- [ ] plasma-desktop
 - [ ] plasma6-disks
 - [ ] plasma6-firewall
 - [ ] plasma6-integration
@@ -230,8 +230,8 @@ libmtp
 - [ ] plasma6-systemmonitor
 - [ ] plasma6-thunderbolt
 - [ ] plasma6-vault
- [ ] plasma6-workspace
- [ ] plasma6-workspace-wallpapers
+- [ ] plasma-workspace
+- [ ] plasma-workspace-wallpapers


 ## labwc (8)
--- a/drkonqi/drkonqi6.spec
+++ b/drkonqi/drkonqi6.spec
@@ -122,6 +122,7 @@ install -p -D -m755 src/doc/examples/installdbgsymbols_suse.sh \
 %{_kf6_sharedir}/dbus-1/system.d/org.kde.drkonqi.conf
 %{_kf6_sharedir}/polkit-1/actions/org.kde.drkonqi.policy
 %{_kf6_sharedir}/drkonqi/
+%{_kf6_plugindir}/drkonqi/KDECoredumpNotifierTruck.so
 %{_libexecdir}/drkonqi
 %{_libexecdir}/drkonqi-coredump-cleanup
 %{_libexecdir}/drkonqi-coredump-launcher
--- a/kde-gtk-config/kde-gtk-config.spec
+++ b/kde-gtk-config/kde-gtk-config.spec
@@ -39,8 +39,8 @@ Recommends:     xsettingsd
 Recommends:     kde-gtk-config6-gtk3
 Suggests:       gtk2-metatheme-breeze
 Suggests:       gtk3-metatheme-breeze
-Supplements:    (plasma6-workspace and libgtk-2_0-0)
-Supplements:    (plasma6-workspace and libgtk-3-0)
+Supplements:    (plasma-workspace and libgtk-2_0-0)
+Supplements:    (plasma-workspace and libgtk-3-0)
 Provides:       kde-gtk-config5 = %{version}
 Obsoletes:      kde-gtk-config5 < %{version}
 Obsoletes:      kde-gtk-config5-lang < %{version}
--- a/kf6-qqc2-desktop-style/kf6-qqc2-desktop-style.spec
+++ b/kf6-qqc2-desktop-style/kf6-qqc2-desktop-style.spec
@@ -30,11 +30,11 @@ BuildRequires:  qt6-linguist
 Requires:       kf6-sonnet >= %{_kf6_version}
 # Qt QML runtime imports are provided by qt6-qtdeclarative itself
 Requires:       qt6-qtdeclarative >= %{qt6_version}
-# plasma6-workspace sets up the env variables so that this theme
+# plasma-workspace sets up the env variables so that this theme
 # is picked by default. It still works fine without it (no requires),
-# but looks better with it. By itself plasma6-workspace does not use
+# but looks better with it. By itself plasma-workspace does not use
 # it (yet), so only install it with qt6-qtdeclarative.
-Supplements:    (plasma6-workspace and qt6-qtdeclarative)
+Supplements:    (plasma-workspace and qt6-qtdeclarative)
 Obsoletes:      qqc2-desktop-style-lang < %{version}

 %description
--- a/kscreen6/kscreen6.spec
+++ b/kscreen6/kscreen6.spec
@@ -49,7 +49,7 @@ Requires:       libkscreen6-plugin >= %{_plasma6_bugfix}
 # For graz.avif
 Requires:       kf6-kimageformats
 Requires:       xrdb
-Supplements:    (libkscreen6-plugin and plasma6-workspace)
+Supplements:    (libkscreen6-plugin and plasma-workspace)
 Obsoletes:      kscreen5 < %{version}
 Obsoletes:      kscreen5-lang < %{version}
 Obsoletes:      kscreen5-plasmoid < %{version}
--- a/plasma6-browser-integration/plasma6-browser-integration.spec
+++ b/plasma6-browser-integration/plasma6-browser-integration.spec
@@ -42,11 +42,11 @@ BuildRequires:  cmake(PlasmaActivities) >= %{_plasma6_bugfix}
 BuildRequires:  cmake(Qt6DBus) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Gui) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Widgets) >= %{qt6_version}
-Supplements:    (plasma6-workspace and GoogleChrome)
-Supplements:    (plasma6-workspace and MozillaFirefox)
-Supplements:    (plasma6-workspace and chromium)
-Supplements:    (plasma6-workspace and opera)
-Supplements:    (plasma6-workspace and vivaldi)
+Supplements:    (plasma-workspace and GoogleChrome)
+Supplements:    (plasma-workspace and MozillaFirefox)
+Supplements:    (plasma-workspace and chromium)
+Supplements:    (plasma-workspace and opera)
+Supplements:    (plasma-workspace and vivaldi)
 Provides:       plasma-browser-integration = %{version}
 Obsoletes:      plasma-browser-integration < %{version}
 Obsoletes:      plasma-browser-integration-lang < %{version}
--- a/plasma6-desktop/plasma6-desktop.spec
+++ b/plasma6-desktop/plasma6-desktop.spec
@@ -12,20 +12,19 @@
 %define kf6_version 6.18.0
 %define qt6_version 6.9.0

-%define rname plasma-desktop
 # Full Plasma 6 version (e.g. 6.0.0)
 %{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}}
 # Latest ABI-stable Plasma (e.g. 6.0 in KF6, but 6.0.80 in KUF)
 %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')}

-Name:           plasma6-desktop
+Name:           plasma-desktop
 Version:        6.5.5
 Release:        %autorelease
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0-only
 URL:            https://www.kde.org/
 #!RemoteAsset
-Source:         https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
+Source:         https://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz

 # PATCH-FIX
 Patch100:       0001-Apply-branding-to-default-favorites.patch
@@ -127,8 +126,8 @@ BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(xkbfile)
 BuildRequires:  pkgconfig(xkbregistry)
 BuildRequires:  pkgconfig(xkeyboard-config)
-Requires:       plasma6-desktop-branding = %{version}
-Requires:       plasma6-workspace >= %{_plasma6_bugfix}
+Requires:       plasma-desktop-branding = %{version}
+Requires:       plasma-workspace >= %{_plasma6_bugfix}
 # Required by the 'recent files' kcm
 Requires:       qt6-qtbase >= %{qt6_version}
 %requires_ge    libplasma
@@ -150,7 +149,7 @@ Requires:       plasma-activities >= %{_plasma6_bugfix}
 Requires:       signon-plugin-oauth2
 Conflicts:      kactivities5 < 5.20.0
 Recommends:     plasma6-addons
-Recommends:     plasma6-desktop-emojier
+Recommends:     plasma-desktop-emojier
 Recommends:     xdg-user-dirs
 Provides:       kdebase4-workspace = 5.3.0
 Obsoletes:      kdebase4-workspace < 5.3.0
@@ -164,7 +163,7 @@ Conflicts:      kio-extras5 <= 5.3.2
 Provides:       kcm-touchpad5 = %{version}
 Obsoletes:      kcm-touchpad5 < %{version}
 Provides:       plasma5-desktop-branding-upstream = %{version}
-Provides:       plasma6-desktop-branding = %{version}
+Provides:       plasma-desktop-branding = %{version}
 Obsoletes:      plasma5-desktop-branding-upstream < %{version}
 Provides:       plasma5-desktop = %{version}
 Obsoletes:      plasma5-desktop < %{version}
@@ -186,7 +185,7 @@ This package contains the basic packages for a Plasma workspace.

 %package        emojier
 Summary:        Selection window for emoji text input
-Requires:       plasma6-desktop = %{version}
+Requires:       plasma-desktop = %{version}
 # Other color fonts don't really work that well
 Recommends:     noto-coloremoji-fonts
 Provides:       plasma5-desktop-emojier = %{version}
@@ -212,7 +211,7 @@ Plasma 6 Input Method Backend for SCIM (Smart Chinese/Common Input Method) suppo
 %endif

 %prep
-%autosetup -p1 -n %{rname}-%{version}
+%autosetup -p1 -n %{name}-%{version}

 %build
 %cmake_kf6 \
--- a/plasma6-mobile/plasma6-mobile.spec
+++ b/plasma6-mobile/plasma6-mobile.spec
@@ -85,7 +85,7 @@ Requires:       milou6 >= %{_plasma6_bugfix}
 Requires:       plasma6-nano >= %{_plasma6_bugfix}
 Requires:       plasma6-nm >= %{_plasma6_bugfix}
 Requires:       plasma6-pa >= %{_plasma6_bugfix}
-Requires:       plasma6-workspace >= %{_plasma6_bugfix}
+Requires:       plasma-workspace >= %{_plasma6_bugfix}
 Requires:       qt6-qtdeclarative >= %{qt6_version}
 Requires:       qt6-qt5compat-imports >= %{qt6_version}
 Requires:       qt6-qtwayland >= %{qt6_version}
--- a/plasma6-nano/plasma6-nano.spec
+++ b/plasma6-nano/plasma6-nano.spec
@@ -33,7 +33,7 @@ BuildRequires:  cmake(Qt6Qml) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Quick) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Svg) >= %{qt6_version}
 BuildRequires:  qt6-qtbase-private-devel >= %{qt6_version}
-Requires:       plasma6-workspace >= %{_plasma6_bugfix}
+Requires:       plasma-workspace >= %{_plasma6_bugfix}
 %requires_ge    libplasma
 Recommends:     plasma6-nm
 Provides:       plasma5-nano = %{version}
--- a/plasma6-nm/plasma6-nm.spec
+++ b/plasma6-nm/plasma6-nm.spec
@@ -71,7 +71,7 @@ Requires:       kwalletd6
 # The KCM desktop files launch systemsettings
 Requires:       systemsettings
 Recommends:     mobile-broadband-provider-info
-Supplements:    (plasma6-desktop and NetworkManager)
+Supplements:    (plasma-desktop and NetworkManager)
 Provides:       plasma-nm-kf5 = %{version}
 Obsoletes:      plasma-nm-kf5 < %{version}
 Provides:       plasma-nm5 = %{version}
--- a/plasma6-pa/plasma6-pa.spec
+++ b/plasma6-pa/plasma6-pa.spec
@@ -48,7 +48,7 @@ Requires:       kirigami-addons
 Requires:       (pulseaudio-module-x11 or pipewire-pulseaudio)
 # boo#1092871
 Recommends:     (pulseaudio-module-gsettings if pulseaudio)
-Supplements:    (plasma6-desktop and (pulseaudio or pipewire-pulseaudio))
+Supplements:    (plasma-desktop and (pulseaudio or pipewire-pulseaudio))
 Provides:       plasma5-pa = %{version}
 Obsoletes:      plasma5-pa < %{version}
 Obsoletes:      plasma5-pa-lang < %{version}
--- a/plasma6-workspace-wallpapers/plasma6-workspace-wallpapers.spec
+++ b/plasma6-workspace-wallpapers/plasma6-workspace-wallpapers.spec
@@ -9,7 +9,7 @@
 %define rname plasma-workspace-wallpapers


-Name:           plasma6-workspace-wallpapers
+Name:           plasma-workspace-wallpapers
 Version:        6.5.5
 Release:        %autorelease
 Summary:        Additional Plasma Wallpapers
--- a/plasma6-workspace/plasma6-workspace.spec
+++ b/plasma6-workspace/plasma6-workspace.spec
@@ -11,20 +11,20 @@

 %define kf6_version 6.18.0
 %define qt6_version 6.9.0
-%define rname plasma-workspace
+
 # Full Plasma 6 version (e.g. 6.0.0)
 %{!?_plasma6_bugfix: %global _plasma6_bugfix %{version}}
 # Latest ABI-stable Plasma (e.g. 6.0 in KF6, but 6.0.80 in KUF)
 %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')}

-Name:           plasma6-workspace
+Name:           plasma-workspace
 Version:        6.5.5
 Release:        %autorelease
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0-or-later
 URL:            https://www.kde.org/
 #!RemoteAsset
-Source:         https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
+Source:         https://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz

 Source3:        sddm.conf
 Source4:        waitforkded.conf
@@ -152,7 +152,7 @@ BuildRequires:  docbook-xsl
 BuildRequires:  docbook-dtds
 Requires:       iso-codes
 Requires:       iso-codes-lang
-Requires:       plasma6-workspace-libs = %{version}-%{release}
+Requires:       plasma-workspace-libs = %{version}-%{release}
 # Needed for kcm_users
 Requires:       accountsservice
 # contains default style, cursors, etc
@@ -204,7 +204,7 @@ Recommends:     qt6-virtualkeyboard-imports >= %{qt6_version}
 # For dmenudbusmenuproxy
 Recommends:     (appmenu-gtk2-module if libgtk-2_0-0)
 Recommends:     (appmenu-gtk3-module if libgtk-3-0)
-# plasma6-desktop 'Provides' kdebase4-workspace < 5.3.0
+# plasma-desktop 'Provides' kdebase4-workspace < 5.3.0
 Conflicts:      kdebase4-workspace < 5.3.0
 Provides:       plasma5-workspace = %{version}
 Obsoletes:      plasma5-workspace < %{version}
@@ -228,8 +228,8 @@ Obsoletes:      ksysguard5 < %{version}
 Obsoletes:      ksysguard5-lang < %{version}
 # Some files have been moved from kio-extras5 to plasma5-workspace in 5.4. This should prevent a possible file conflict. (boo#944656)
 Conflicts:      kio-extras5 < 15.08.0
-Provides:       plasma6-workspace-branding = %{_plasma6_bugfix}
-Provides:       plasma6-workspace-branding-upstream = %{version}
+Provides:       plasma-workspace-branding = %{_plasma6_bugfix}
+Provides:       plasma-workspace-branding-upstream = %{version}
 # plasmashell implements the dbus interface org.freedesktop.Notifications directly
 Provides:       dbus(org.freedesktop.Notifications)
 Provides:       qt6qmlimport(org.kde.plasma.shell)
@@ -254,7 +254,7 @@ This package contains the basic packages for a KDE Plasma 6 workspace.

 %package        devel
 Summary:        The KDE Plasma Workspace Components
-Requires:       plasma6-workspace-libs = %{version}-%{release}
+Requires:       plasma-workspace-libs = %{version}-%{release}
 Requires:       cmake(KF6ItemModels) >= %{kf6_version}
 Requires:       cmake(LayerShellQt) >= %{_plasma6_bugfix}
 Requires:       cmake(Plasma) >= %{_plasma6_bugfix}
@@ -274,8 +274,8 @@ Summary:        KDE Plasma 6 Session
 Requires:       breeze6 >= %{_plasma6_bugfix}
 Requires:       breeze6-decoration >= %{_plasma6_bugfix}
 Requires:       kf6-kwindowsystem >= %{kf6_version}
-Requires:       plasma6-desktop >= %{_plasma6_bugfix}
-Requires:       plasma6-workspace >= %{_plasma6_bugfix}
+Requires:       plasma-desktop >= %{_plasma6_bugfix}
+Requires:       plasma-workspace >= %{_plasma6_bugfix}
 Requires:       polkit-kde-agent-1 >= %{_plasma6_bugfix}
 Requires:       powerdevil >= %{_plasma6_bugfix}
 Requires:       systemsettings >= %{_plasma6_bugfix}
@@ -324,7 +324,7 @@ Supplements:    (%{name} and sddm)
 This package confirms defaults for SDDM suitable for Plasma 6.

 %prep
-%autosetup -p1 -n %{rname}-%{version}
+%autosetup -p1 -n %{name}-%{version}

 %build
 %cmake_kf6 \
--- a/powerdevil/powerdevil.spec
+++ b/powerdevil/powerdevil.spec
@@ -63,7 +63,7 @@ Requires:       kf6-kidletime-plugins
 Requires:       kf6-knotifications-imports
 #PrepareForSleep is added to systemd 198, and with Plasma 5.2, will be unconditionaly called
 Requires:       systemd >= 198
-%requires_ge    plasma6-workspace-libs
+%requires_ge    plasma-workspace-libs
 Provides:       powerdevil5 = %{version}
 Obsoletes:      powerdevil5 < %{version}
 Obsoletes:      powerdevil5-lang < %{version}
--- a/sddm-kcm6/sddm-kcm6.spec
+++ b/sddm-kcm6/sddm-kcm6.spec
@@ -7,15 +7,14 @@
 %define kf6_version 6.18.0
 %define qt6_version 6.9.0

-%define rname sddm-kcm
-
-Name:           sddm-kcm6
-Version:        6.5.4
+Name:           sddm-kcm
+Version:        6.5.5
 Release:        0
 Summary:        A sddm control module for KDE
 License:        GPL-2.0-only
 URL:            https://projects.kde.org/projects/kdereview/sddm-kcm/repository
 Source:         https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
+
 BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
 BuildRequires:  pkgconfig
 BuildRequires:  cmake(KF6Archive) >= %{kf6_version}
@@ -30,7 +29,7 @@ BuildRequires:  cmake(Qt6Gui) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Quick) >= %{qt6_version}
 BuildRequires:  cmake(Qt6QuickWidgets) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Widgets) >= %{qt6_version}
-Supplements:    (sddm and plasma6-workspace)
+Supplements:    (sddm and plasma-workspace)
 Provides:       kcm_sddm = %{version}
 Obsoletes:      kcm_sddm < %{version}
 Obsoletes:      kcm_sddm-lang < %{version}
@@ -41,7 +40,7 @@ SDDM control module for Plasma. It provides a graphical frontend for the SDDM.
 %lang_package

 %prep
-%autosetup -p1 -n %{rname}-%{version}
+%autosetup -p1 -n %{}-%{version}

 %build
 %cmake_kf6
--- a/sddmold/sddm.spec
+++ b/sddmold/sddm.spec
@@ -252,7 +252,7 @@ fi
 %{_libdir}/qt%{qtver}/qml/
 %{_datadir}/sddm/translations-qt%{qtver}/

-# The Plasma 6 branding is supplied by plasma6-workspace
+# The Plasma 6 branding is supplied by plasma-workspace
 %files branding-openruyi
 %license LICENSE*
 %doc README*
--- a/xdg-desktop-portal-kde/xdg-desktop-portal-kde.spec
+++ b/xdg-desktop-portal-kde/xdg-desktop-portal-kde.spec
@@ -55,9 +55,9 @@ BuildRequires:  pkgconfig(xkbcommon)
 Requires:       kf6-kiconthemes-imports >= %{kf6_version}
 Requires:       kpipewire >= %{_plasma6_bugfix}
 # For org.kde.plasma.workspace.dialogs.1 import
-Requires:       plasma6-workspace >= %{_plasma6_bugfix}
+Requires:       plasma-workspace >= %{_plasma6_bugfix}
 Requires:       xdg-desktop-portal
-Supplements:    (xdg-desktop-portal and plasma6-desktop)
+Supplements:    (xdg-desktop-portal and plasma-desktop)
 Provides:       xdg-desktop-portal-kde = %{version}
 Obsoletes:      xdg-desktop-portal-kde < %{version}
 Obsoletes:      xdg-desktop-portal-kde-lang < %{version}