Merge branch epel9-next into epel9

.gitignore

@@ -69,3 +69,12 @@
 /plasma-workspace-5.23.3.tar.xz
 /plasma-workspace-5.23.4.tar.xz
 /plasma-workspace-5.23.5.tar.xz
+/plasma-workspace-5.23.90.tar.xz
+/plasma-workspace-5.24.0.tar.xz
+/plasma-workspace-5.24.1.tar.xz
+/plasma-workspace-5.24.2.tar.xz
+/sddm-theme-5.24.80~pre.tar.gz
+/plasma-workspace-5.24.3.tar.xz
+/plasma-workspace-5.24.4.tar.xz
+/plasma-workspace-5.24.5.tar.xz
+/plasma-workspace-5.24.6.tar.xz

plasma-workspace-5.21.90-konsole-in-contextmenu.patch

@@ -1,78 +0,0 @@
-diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
-index 3271140..28409ff 100644
---- a/containmentactions/contextmenu/menu.cpp
-+++ b/containmentactions/contextmenu/menu.cpp
-@@ -28,6 +28,7 @@
- #include <KAuthorized>
- #include <KGlobalAccel>
- #include <KLocalizedString>
-+#include <KToolInvocation>
- #include <QDebug>
- #include <QIcon>
- 
-@@ -41,6 +42,7 @@
- ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
-     : Plasma::ContainmentActions(parent, args)
-     , m_runCommandAction(nullptr)
-+    , m_runKonsoleAction(nullptr)
-     , m_lockScreenAction(nullptr)
-     , m_logoutAction(nullptr)
-     , m_separator1(nullptr)
-@@ -71,7 +73,7 @@ void ContextMenu::restore(const KConfigGroup &config)
-     } else {
-         actions.insert(QStringLiteral("configure shortcuts"), false);
-         m_actionOrder << QStringLiteral("configure") << QStringLiteral("run associated application") << QStringLiteral("configure shortcuts")
--                      << QStringLiteral("_sep1") << QStringLiteral("_context") << QStringLiteral("_run_command") << QStringLiteral("add widgets")
-+                      << QStringLiteral("_sep1") << QStringLiteral("_context") << QStringLiteral("_run_konsole") << QStringLiteral("_run_command") << QStringLiteral("add widgets")
-                       << QStringLiteral("_add panel") << QStringLiteral("manage activities") << QStringLiteral("remove") << QStringLiteral("edit mode")
-                       << QStringLiteral("_sep2") << QStringLiteral("_lock_screen") << QStringLiteral("_logout") << QStringLiteral("_sep3")
-                       << QStringLiteral("_wallpaper");
-@@ -95,6 +97,10 @@ void ContextMenu::restore(const KConfigGroup &config)
-         m_runCommandAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("krunner.desktop"), QStringLiteral("_launch")).value(0));
-         connect(m_runCommandAction, &QAction::triggered, this, &ContextMenu::runCommand);
- 
-+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
-+        m_runKonsoleAction->setIcon(QIcon::fromTheme("utilities-terminal"));
-+        connect(m_runKonsoleAction, &QAction::triggered, this, &ContextMenu::runKonsole);
-+
-         m_lockScreenAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Lock Screen"), this);
-         m_lockScreenAction->setIcon(QIcon::fromTheme(QStringLiteral("system-lock-screen")));
-         m_lockScreenAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("ksmserver"), QStringLiteral("Lock Session")).value(0));
-@@ -173,6 +179,8 @@ QAction *ContextMenu::action(const QString &name)
-         if (KAuthorized::authorizeAction(QStringLiteral("run_command")) && KAuthorized::authorize(QStringLiteral("run_command"))) {
-             return m_runCommandAction;
-         }
-+    } else if (name == QLatin1String("_run_konsole")) {
-+        return m_runKonsoleAction;
-     } else if (name == QLatin1String("_lock_screen")) {
-         if (KAuthorized::authorizeAction(QStringLiteral("lock_screen"))) {
-             return m_lockScreenAction;
-@@ -196,6 +204,11 @@ QAction *ContextMenu::action(const QString &name)
-     return nullptr;
- }
- 
-+void ContextMenu::runKonsole()
-+{
-+    KToolInvocation::invokeTerminal(QString(), QDir::homePath());
-+}
-+
- void ContextMenu::runCommand()
- {
-     if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) {
-diff --git a/containmentactions/contextmenu/menu.h b/containmentactions/contextmenu/menu.h
-index 3cc3d32..6c5aa21 100644
---- a/containmentactions/contextmenu/menu.h
-+++ b/containmentactions/contextmenu/menu.h
-@@ -43,10 +43,12 @@ public:
- 
- public Q_SLOTS:
-     void runCommand();
-+    void runKonsole();
-     void startLogout();
- 
- private:
-     QAction *m_runCommandAction;
-+    QAction *m_runKonsoleAction;
-     QAction *m_lockScreenAction;
-     QAction *m_logoutAction;
-     QAction *m_separator1;

plasma-workspace-5.23.3-correct-endpoint.patch

@@ -1,26 +0,0 @@
-diff --git a/components/shellprivate/wallpaperplugin.knsrc b/components/shellprivate/wallpaperplugin.knsrc
-index 1495b6e271421f8b4c10c9b3fe0d6c8c9b59f5ba..3ed59f75d53a844d166b116318b4f66f0ca4c2d8 100644
---- a/components/shellprivate/wallpaperplugin.knsrc
-+++ b/components/shellprivate/wallpaperplugin.knsrc
-@@ -42,7 +42,7 @@ Name[x-test]=xxWallpaper Pluginsxx
- Name[zh_CN]=壁纸插件
- Name[zh_TW]=桌布外掛程式
- 
--ProvidersUrl=https://download.kde.org/ocs/providers.xml
-+ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
- Categories=Plasma Wallpaper Plugin
- StandardResource=tmp
- Uncompress=kpackage
-diff --git a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
-index 99c19542344ed0190a83452d7a1df16629433cf8..fd41b1f8963d97b691219088558ea1bfc1adec1d 100644
---- a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
-+++ b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
-@@ -42,7 +42,7 @@ Name[vi]=Phông chữ
- Name[x-test]=xxFontsxx
- Name[zh_CN]=字体
- 
--ProvidersUrl=https://distribute.kde.org/khotnewstuff/fonts-providers.xml
-+ProvidersUrl=https://cdn.kde.org/khotnewstuff/v1/fonts-providers.xml
- Categories=KDE-Look.org Fonts
- TargetDir=kfontinst
- Uncompress=archive

plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch

@@ -0,0 +1,26 @@
+diff --git a/shell/packageplugins/lookandfeel/lookandfeel.cpp b/shell/packageplugins/lookandfeel/lookandfeel.cpp
+index d50b3e96f..556877af6 100644
+--- a/shell/packageplugins/lookandfeel/lookandfeel.cpp
++++ b/shell/packageplugins/lookandfeel/lookandfeel.cpp
+@@ -10,7 +10,7 @@
+ #include <KLocalizedString>
+ #include <KPackage/PackageLoader>
+ 
+-#define DEFAULT_LOOKANDFEEL "org.kde.breeze.desktop"
++#define DEFAULT_LOOKANDFEEL "@DEFAULT_LOOKANDFEEL@"
+ 
+ void LookAndFeelPackage::initPackage(KPackage::Package *package)
+ {
+diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
+index bd848dda0..43978a712 100644
+--- a/startkde/startplasma.cpp
++++ b/startkde/startplasma.cpp
+@@ -365,7 +365,7 @@ void setupPlasmaEnvironment()
+     qputenv("XDG_CONFIG_DIRS", extraConfigDir + ":" + currentConfigDirs);
+ 
+     const KConfig globals;
+-    const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("org.kde.breeze.desktop"));
++    const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("@DEFAULT_LOOKANDFEEL@"));
+     QFile activeLnf(QString::fromUtf8(extraConfigDir + "/package"));
+     activeLnf.open(QIODevice::ReadOnly);
+     if (activeLnf.readLine() != currentLnf.toUtf8()) {

plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch

@@ -1,13 +0,0 @@
-diff --git a/shell/packageplugins/lookandfeel/lookandfeel.cpp b/shell/packageplugins/lookandfeel/lookandfeel.cpp
-index a6cef04..82c6d36 100644
---- a/shell/packageplugins/lookandfeel/lookandfeel.cpp
-+++ b/shell/packageplugins/lookandfeel/lookandfeel.cpp
-@@ -23,7 +23,7 @@
- #include <KLocalizedString>
- #include <KPackage/PackageLoader>
- 
--#define DEFAULT_LOOKANDFEEL "org.kde.breeze.desktop"
-+#define DEFAULT_LOOKANDFEEL "@DEFAULT_LOOKANDFEEL@"
- 
- void LookAndFeelPackage::initPackage(KPackage::Package *package)
- {

plasma-workspace-konsole-in-contextmenu.patch

@@ -0,0 +1,79 @@
+diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/CMakeLists.txt.konsole-in-contextmenu plasma-workspace-5.23.90/containmentactions/contextmenu/CMakeLists.txt
+diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp
+--- plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu	2022-01-13 07:19:17.000000000 -0600
++++ plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp	2022-01-19 16:09:26.778355795 -0600
+@@ -16,6 +16,7 @@
+ #include <KGlobalAccel>
+ #include <KIO/CommandLauncherJob>
+ #include <KLocalizedString>
++#include <KTerminalLauncherJob>
+ #include <QDebug>
+ #include <QIcon>
+ 
+@@ -29,6 +30,7 @@
+ ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
+     : Plasma::ContainmentActions(parent, args)
+     , m_runCommandAction(nullptr)
++    , m_runKonsoleAction(nullptr)
+     , m_lockScreenAction(nullptr)
+     , m_logoutAction(nullptr)
+     , m_configureDisplaysAction(nullptr)
+@@ -68,6 +70,7 @@ void ContextMenu::restore(const KConfigG
+                       << QStringLiteral("configure shortcuts")
+                       << QStringLiteral("_sep1")
+                       << QStringLiteral("_context")
++                      << QStringLiteral("_run_konsole")
+                       << QStringLiteral("_run_command")
+                       << QStringLiteral("add widgets")
+                       << QStringLiteral("_add panel")
+@@ -102,6 +105,10 @@ void ContextMenu::restore(const KConfigG
+         m_runCommandAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("krunner.desktop"), QStringLiteral("_launch")).value(0));
+         connect(m_runCommandAction, &QAction::triggered, this, &ContextMenu::runCommand);
+ 
++	m_runKonsoleAction = new QAction(i18n("Konsole"), this);
++	m_runKonsoleAction->setIcon(QIcon::fromTheme("utilities-terminal"));
++	connect(m_runKonsoleAction, &QAction::triggered, this, &ContextMenu::runKonsole);
++
+         m_lockScreenAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Lock Screen"), this);
+         m_lockScreenAction->setIcon(QIcon::fromTheme(QStringLiteral("system-lock-screen")));
+         m_lockScreenAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("ksmserver"), QStringLiteral("Lock Session")).value(0));
+@@ -184,6 +191,8 @@ QAction *ContextMenu::action(const QStri
+         if (KAuthorized::authorizeAction(QStringLiteral("run_command")) && KAuthorized::authorize(QStringLiteral("run_command"))) {
+             return m_runCommandAction;
+         }
++    } else if (name == QLatin1String("_run_konsole")) {
++	    return m_runKonsoleAction;
+     } else if (name == QLatin1String("_lock_screen")) {
+         if (KAuthorized::authorizeAction(QStringLiteral("lock_screen"))) {
+             return m_lockScreenAction;
+@@ -211,6 +220,13 @@ QAction *ContextMenu::action(const QStri
+     return nullptr;
+ }
+ 
++void ContextMenu::runKonsole()
++{
++    auto job = new KTerminalLauncherJob(QString());
++    job->setWorkingDirectory(QDir::homePath());
++    job->start();
++}
++
+ void ContextMenu::runCommand()
+ {
+     if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) {
+diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h.konsole-in-contextmenu plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h
+--- plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h.konsole-in-contextmenu	2022-01-19 16:07:20.060556636 -0600
++++ plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h	2022-01-19 16:08:43.055454606 -0600
+@@ -29,11 +29,13 @@ public:
+ 
+ public Q_SLOTS:
+     void runCommand();
++    void runKonsole();
+     void startLogout();
+     void configureDisplays();
+ 
+ private:
+     QAction *m_runCommandAction;
++    QAction *m_runKonsoleAction;
+     QAction *m_lockScreenAction;
+     QAction *m_logoutAction;
+     QAction *m_configureDisplaysAction;

plasma-workspace.spec

@@ -5,12 +5,19 @@
 %global kf5_version_min 5.82.0
 
 # Control wayland by default
-%if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9)
+%if (0%{?rhel} && 0%{?rhel} < 9)
 %bcond_with wayland_default
 %else
 %bcond_without wayland_default
 %endif
 
+# Control sddm wayland by default
+%if (0%{?fedora} && 0%{?fedora} < 37) || (0%{?rhel} && 0%{?rhel} < 9)
+%bcond_with sddm_wayland_default
+%else
+%bcond_without sddm_wayland_default
+%endif
+
 # Control systemdBoot by default
 %if 0%{?rhel} && 0%{?rhel} < 9
 %bcond_with systemdBoot
@@ -20,7 +27,7 @@
 
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
-Version: 5.23.5
+Version: 5.24.6
 Release: 2%{?dist}
 
 License: GPLv2+
@@ -45,6 +52,10 @@ Source10:       kde
 Source11:       startkderc
 Source15:       fedora.desktop
 
+# backported breeze sddm from plasma 5.24.80~pre
+# lets us apply patches to fix the sddm theme
+Source19:       sddm-theme-5.24.80~pre.tar.gz
+
 # breeze fedora sddm theme components
 # includes f25-based preview (better than breeze or nothing at least)
 Source20:       breeze-fedora-0.2.tar.gz
@@ -55,23 +66,19 @@ Source20:       breeze-fedora-0.2.tar.gz
 Source40:       ssh-agent.conf
 Source41:       spice-vdagent.conf
 
+## upstream Patches (master branch)
+
+## upstreamable Patches
+
 ## downstream Patches
-#Patch100:       plasma-workspace-5.21.90-konsole-in-contextmenu.patch
+Patch100:       plasma-workspace-konsole-in-contextmenu.patch
-Patch101:       plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch
+Patch101:       plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch
 # default to folderview (instead of desktop) containment, see also
 # https://mail.kde.org/pipermail/distributions/2016-July/000133.html
 # and example,
 # https://github.com/notmart/artwork-lnf-netrunner-core/blob/master/usr/share/plasma/look-and-feel/org.kde.netrunner-core.desktop/contents/defaults
 Patch105:       plasma-workspace-5.21.90-folderview_layout.patch
 
-## upstreamable Patches
-
-## upstream Patches (master branch)
-
-## Backported patches
-# https://bugzilla.redhat.com/show_bug.cgi?id=2065761
-Patch300: plasma-workspace-5.23.3-correct-endpoint.patch
-
 # udev
 BuildRequires:  zlib-devel
 BuildRequires:  dbusmenu-qt5-devel
@@ -99,7 +106,7 @@ BuildRequires:  xcb-util-devel
 BuildRequires:  glib2-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  boost-devel
-BuildRequires:  libusb-devel
+BuildRequires:  pkgconfig(libusb)
 BuildRequires:  libbsd-devel
 BuildRequires:  pam-devel
 BuildRequires:  lm_sensors-devel
@@ -141,6 +148,8 @@ BuildRequires:  kf5-kguiaddons-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kidletime-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kinit-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kitemmodels-devel >= %{kf5_version_min}
+# konsole patch
+BuildRequires:  kf5-kio-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kjsembed-devel >= %{kf5_version_min}
 BuildRequires:  kf5-knewstuff-devel >= %{kf5_version_min}
 BuildRequires:  kf5-knotifications-devel >= %{kf5_version_min}
@@ -203,7 +212,7 @@ Requires:       %{name}-common = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       libkworkspace5%{?_isa} = %{version}-%{release}
 # for selinux settings
-Requires:       policycoreutils
+Requires:       (policycoreutils if selinux-policy)
 
 # for libkdeinit5_*
 %{?kf5_kinit_requires}
@@ -252,13 +261,9 @@ Requires:       iceauth xrdb xprop
 Requires:       kde-settings-plasma
 
 # Default look-and-feel theme
-%if 0%{?fedora}
 %global default_lookandfeel org.fedoraproject.fedora.desktop
 Requires:       plasma-lookandfeel-fedora = %{version}-%{release}
-%endif
-%if ! 0%{?default_lookandfeel:1}
 Requires:       desktop-backgrounds-compat
-%endif
 
 Requires:       systemd
 
@@ -388,10 +393,8 @@ Recommends:     qt5-qtvirtualkeyboard
 # org.kde.plasma.workspace.keyboardlayout
 Requires:       %{name} = %{version}-%{release}
 # /usr/share/backgrounds/default.png
-%if 0%{?fedora}
 BuildRequires:  desktop-backgrounds-compat
 Requires:       desktop-backgrounds-compat
-%endif
 %if 0%{?rhel}
 Requires:       system-logos
 %endif
@@ -399,6 +402,21 @@ BuildArch: noarch
 %description -n sddm-breeze
 %{summary}.
 
+%package -n sddm-wayland-plasma
+Summary:        Plasma Wayland SDDM greeter configuration
+Provides:       sddm-greeter-displayserver
+Conflicts:      sddm-greeter-displayserver
+Requires:       kwin-wayland >= %{majmin_ver}
+Requires:       maliit-keyboard
+%if %{with sddm_wayland_default}
+Supplements:    (sddm and plasma-workspace-wayland)
+%endif
+BuildArch:      noarch
+
+%description -n sddm-wayland-plasma
+This package contains configuration and dependencies for SDDM
+to use KWin for the Wayland compositor for the greeter.
+
 %package wayland
 Summary:        Wayland support for Plasma
 Requires:       %{name} = %{version}-%{release}
@@ -444,23 +462,20 @@ BuildArch: noarch
 
 
 %prep
-%setup -q -a 20
+%setup -q -a 19 -a 20
 
 ## upstream patches
-# FIXME/TODO: commented out in need of work: does not applyl cleanly and
+
-# potentially causes problems:
+## upstreamable patches
-# Since it appears plasma-workspace no longer uses kinit, the KToolInvocation::invokeTerminal call may not be 100% reliable
+
-#%patch100 -p1 -b .konsole-in-contextmenu
+## downstream patches
-# FIXME/TODO:  it is unclear whether this is needed or even a good idea anymore -- rex
+%patch100 -p1 -b .konsole-in-contextmenu
-%if 0%{?default_lookandfeel:1}
+# XXX: This is horribly broken and needs fixes upstream -- ngompa
 %patch101 -p1 -b .set-fedora-default-look-and-feel
 sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfeel:org.kde.breeze.desktop}|g" \
-  shell/packageplugins/lookandfeel/lookandfeel.cpp
+  shell/packageplugins/lookandfeel/lookandfeel.cpp startkde/startplasma.cpp
-%endif
 %patch105 -p1
-%patch300 -p1
 
-%if 0%{?fedora}
 # Populate initial lookandfeel package
 cp -a lookandfeel lookandfeel.fedora
 # Overwrite settings to configure twilight mode
@@ -469,11 +484,11 @@ install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop
 cat >> CMakeLists.txt <<EOL
 plasma_install_package(lookandfeel.fedora org.fedoraproject.fedora.desktop look-and-feel lookandfeel)
 EOL
-%endif
 
 
 %build
 %{cmake_kf5} \
+  -DINSTALL_SDDM_WAYLAND_SESSION:BOOL=ON \
   %{?with_wayland_default:-DPLASMA_WAYLAND_DEFAULT_SESSION:BOOL=ON}
 
 %cmake_build
@@ -490,12 +505,10 @@ chrpath --delete %{buildroot}%{_kf5_qtplugindir}/phonon_platform/kde.so
 ln -s startplasma-x11 %{buildroot}%{_kf5_bindir}/startkde
 %endif
 
-%if 0%{?fedora}
 # remove/replace items to be customized
 ln -sf \
   %{_datadir}/backgrounds/default.png \
   %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/components/artwork/background.png
-%endif
 
 # make fedora-breeze sddm theme variant.
 cp -alf %{buildroot}%{_datadir}/sddm/themes/breeze/ \
@@ -505,13 +518,20 @@ ln -sf  %{_datadir}/backgrounds/default.png \
         %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/components/artwork/background.png
 install -m644 -p breeze-fedora/* \
         %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/
+%if 0%{?fedora} >= 34
+# Set Fedora distro vendor logo
+sed -i -e 's|^showlogo=.*$|showlogo=shown|g' %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/theme.conf
+sed -i -e 's|^logo=.*$|logo=%{_datadir}/pixmaps/fedora_whitelogo.svg|g' %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/theme.conf
+%endif
+
+# move sddm configuration snippet to the right place
+mkdir -p %{buildroot}%{_prefix}/lib/sddm
+mv %{buildroot}%{_sysconfdir}/sddm.conf.d %{buildroot}%{_prefix}/lib/sddm
 
-%if 0%{?fedora} > 30
 ## customize plasma-lookandfeel-fedora defaults
 # from [Wallpaper] Image=Next to Image=Fedora
 sed -i -e 's|^Image=.*$|Image=Fedora|g' \
   %{buildroot}%{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/defaults
-%endif
 
 # Make kcheckpass work
 install -m644 -p -D %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/kde
@@ -537,11 +557,12 @@ cat *.lang | sort | uniq -u > %{name}.lang
 
 
 %check
-desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/plasma-windowed.desktop
 desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,plasmashell,systemmonitor}.desktop
 
 %post
-setsebool -P selinuxuser_execmod 1
+if [ -s /usr/sbin/setsebool ] ; then
+  setsebool -P selinuxuser_execmod 1 ||:
+fi
 
 %files common
 %license LICENSES
@@ -576,6 +597,7 @@ setsebool -P selinuxuser_execmod 1
 %{_libexecdir}/plasma-changeicons
 %{_libexecdir}/plasma-dbus-run-session-if-needed
 %{_kf5_datadir}/ksplash/
+%{_kf5_datadir}/plasma/avatars/
 %{_kf5_datadir}/plasma/plasmoids/
 %{_kf5_datadir}/plasma/services/
 %{_kf5_datadir}/plasma/wallpapers/
@@ -599,9 +621,10 @@ setsebool -P selinuxuser_execmod 1
 %{_datadir}/kfontinst/icons/hicolor/*/actions/*font*.png
 %{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop
 %{_datadir}/krunner/dbusplugins/plasma-runner-baloosearch.desktop
-%{_datadir}/kxmlgui5/kfontinst/kfontviewpart.rc
+%{_datadir}/kxmlgui5/kfontview/kfontviewpart.rc
 %{_datadir}/kxmlgui5/kfontview/kfontviewui.rc
 %{_kf5_datadir}/kservices5/ServiceMenus/installfont.desktop
+%{_kf5_datadir}/kservices5/ServiceMenus/setaswallpaper.desktop
 %{_kf5_datadir}/kservices5/*.desktop
 %{_kf5_datadir}/kservicetypes5/*.desktop
 %{_kf5_datadir}/knotifications5/*.notifyrc
@@ -613,17 +636,17 @@ setsebool -P selinuxuser_execmod 1
 %{_kf5_datadir}/kconf_update/style_widgetstyle_default_breeze.pl
 %{_kf5_datadir}/kconf_update/style_widgetstyle_default_breeze.upd
 %{_kf5_metainfodir}/*.xml
+%{_kf5_datadir}/applications/kcm_*
 %{_kf5_datadir}/applications/org.kde.klipper.desktop
 %{_kf5_datadir}/applications/org.kde.plasmashell.desktop
-%{_kf5_datadir}/applications/plasma-windowed.desktop
 %{_kf5_datadir}/applications/org.kde.systemmonitor.desktop
 %{_kf5_datadir}/applications/org.kde.kcolorschemeeditor.desktop
 %{_kf5_datadir}/applications/org.kde.kfontview.desktop
+%{_kf5_datadir}/applications/org.kde.plasmawindowed.desktop
 %{_kf5_datadir}/qlogging-categories5/*.categories
 %{_sysconfdir}/xdg/plasmanotifyrc
 %{_kf5_datadir}/kpackage/kcms/kcm_autostart/
 %{_kf5_datadir}/kpackage/kcms/kcm_translations/
-%{_kf5_datadir}/kpackage/kcms/kcm5_icons/
 %{_kf5_datadir}/kpackage/kcms/kcm_colors/
 %{_kf5_datadir}/kpackage/kcms/kcm_cursortheme/
 %{_kf5_datadir}/kpackage/kcms/kcm_desktoptheme/
@@ -633,13 +656,18 @@ setsebool -P selinuxuser_execmod 1
 %{_kf5_datadir}/kpackage/kcms/kcm_nightcolor/
 %{_kf5_datadir}/kpackage/kcms/kcm_notifications/
 %{_kf5_datadir}/kpackage/kcms/kcm_style/
+%{_kf5_datadir}/kpackage/kcms/kcm_users/
+%{_kf5_datadir}/kpackage/kcms/kcm_icons/
+%{_kf5_datadir}/kpackage/kcms/kcm_formats/
 %{_kf5_datadir}/polkit-1/actions/org.kde.fontinst.policy
 %{_userunitdir}/*.service
 %{_userunitdir}/plasma-core.target
 %dir %{_userunitdir}/plasma-core.target.d/
 %{_userunitdir}/plasma-core.target.d/ssh-agent.conf
 %{_userunitdir}/plasma-core.target.d/spice-vdagent.conf
-%{_userunitdir}/plasma-workspace@.target
+%{_userunitdir}/plasma-workspace.target
+%{_userunitdir}/plasma-workspace-wayland.target
+%{_userunitdir}/plasma-workspace-x11.target
 %dir %{_userunitdir}/plasma-workspace@.target.d/
 # PAM
 %config(noreplace) %{_sysconfdir}/pam.d/kde
@@ -677,7 +705,7 @@ setsebool -P selinuxuser_execmod 1
 %{_kf5_plugindir}/kio/*.so
 %{_kf5_plugindir}/kded/*.so
 %{_kf5_plugindir}/krunner/*
-%{_qt5_plugindir}/kcms/kcm_*.so
+%{_qt5_plugindir}/plasma/kcms/systemsettings/kcm_*.so
 %{_libdir}/kconf_update_bin/krunnerhistory
 %{_libdir}/kconf_update_bin/krunnerglobalshortcuts
 %{_kf5_qtplugindir}/kf5/parts/kfontviewpart.so
@@ -687,8 +715,10 @@ setsebool -P selinuxuser_execmod 1
 %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchdesktop.so
 %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchwindow.so
 %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchactivity.so
+%{_kf5_qtplugindir}/plasma/kcminit/kcm_fonts_init.so
+%{_kf5_qtplugindir}/plasma/kcminit/kcm_style_init.so
+%{_kf5_qtplugindir}/plasma/kcms/systemsettings_qwidgets/kcm_fontinst.so
 %{_libexecdir}/plasma-sourceenv.sh
-%{_libexecdir}/startplasma-waylandsession
 %{_kf5_datadir}/kconf_update/krunnerhistory.upd
 %{_kf5_datadir}/kconf_update/krunnerglobalshortcuts2.upd
 %{_kf5_datadir}/kglobalaccel/org.kde.krunner.desktop
@@ -729,6 +759,9 @@ setsebool -P selinuxuser_execmod 1
 %{_datadir}/sddm/themes/01-breeze-fedora/
 #%config(noreplace) %{_datadir}/sddm/themes/01-breeze-fedora/theme.conf.user
 
+%files -n sddm-wayland-plasma
+%{_prefix}/lib/sddm/sddm.conf.d/plasma-wayland.conf
+
 %files wayland
 %{_kf5_bindir}/startplasma-wayland
 %if ! %{with wayland_default}
@@ -748,17 +781,61 @@ setsebool -P selinuxuser_execmod 1
 %{_datadir}/xsessions/plasmax11.desktop
 %endif
 
-%if 0%{?fedora}
 %files -n plasma-lookandfeel-fedora
 %{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/
-%endif
 
 
 %changelog
-* Fri Mar 25 2022 Troy Dawson <tdawson@redhat.com> - 5.23.5-2
+* Fri Jul 29 2022 Troy Dawson <tdawson@redhat.com> - 5.24.6-2
-- Correct download enpoints (#2068568)
+- Build plasma-lookandfeel-fedora on everything
+
+* Wed Jul 13 2022 Troy Dawson <tdawson@redhat.com> - 5.24.6-1
+- Update to 5.24.6
+
+* Thu Jun 16 2022 Troy Dawson <tdawson@redhat.com> - 5.24.5-1.1
 - Enable selinuxuser_execmod (#2058657)
 
+* Tue May 03 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.24.5-1
+- 5.24.5
+
+* Thu Mar 31 2022 Justin Zobel <justin@1707.io> - 5.24.4-1
+- Update to 5.24.4
+
+* Mon Mar 14 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.24.3-2
+- Do not use the SDDM Wayland greeter by default for F36
+
+* Tue Mar 08 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.24.3-1
+- 5.24.3
+
+* Tue Mar 08 2022 Jan Grulich <jgrulich@redhat.com> - 5.24.2-4
+- Rebuild (qt5)
+
+* Sun Mar 06 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.24.2-3
+- Backport sddm theme improvements to fix visual bugs (#2054016, #2058468)
+- Correctly set distro logo for fedora breeze sddm theme
+
+* Mon Feb 28 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.24.2-2
+- Refresh default look-and-feel patch to fix for Plasma 5.24
+
+* Tue Feb 22 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.24.2-1
+- 5.24.2
+
+* Tue Feb 15 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.24.1-1
+- 5.24.1
+
+* Fri Feb 11 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.24.0-2
+- Rebuild due to tarball re-spin
+
+* Thu Feb 03 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.24.0-1
+- 5.24.0
+- Add sddm-wayland-plasma subpackage to ship Wayland greeter configuration
+
+* Wed Jan 19 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.23.90-2
+- rebase konsole-in-contextmenu.patch (#2026789)
+
+* Thu Jan 13 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.23.90-1
+- 5.23.90
+
 * Tue Jan 04 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.23.5-1
 - 5.23.5
 

sources

@@ -1,2 +1,3 @@
-SHA512 (plasma-workspace-5.23.5.tar.xz) = 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8
+SHA512 (plasma-workspace-5.24.6.tar.xz) = 4e49f59d565e0b84951122155158966a54c05a6999ff99503bfff667c780fac6cfc076326f0cac7d53629bfc1d81599b30e919848168f6beb79a4dc7cf7c5560
+SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344

sources.keep

@@ -1 +0,0 @@
-SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8

startkde.patch

@@ -1,114 +0,0 @@
-diff -up plasma-workspace-5.12.5/startkde/startkde.cmake.startkde plasma-workspace-5.12.5/startkde/startkde.cmake
---- plasma-workspace-5.12.5/startkde/startkde.cmake.startkde    2018-05-01 08:03:40.000000000 -0500
-+++ plasma-workspace-5.12.5/startkde/startkde.cmake     2018-05-06 21:12:49.592504191 -0500
-@@ -279,22 +237,21 @@ if test $? -ne 0; then
-   # Startup error
-   echo 'startkde: Could not sync environment to dbus.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not sync environment to dbus."
-+  xmessage "Could not sync environment to dbus."
-   exit 1
- fi
- 
--# We set LD_BIND_NOW to increase the efficiency of kdeinit.
--# kdeinit unsets this variable before loading applications.
--LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
-+@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
- if test $? -ne 0; then
-   # Startup error
-   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
-+  xmessage "Could not start kdeinit5. Check your installation."
-   exit 1
- fi
- 
--qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
-+qdbus=qdbus-qt5
-+$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
- 
- # finally, give the session control to the session manager
- # see kdebase/ksmserver for the description of the rest of the startup sequence
-@@ -327,13 +284,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t
-     # wait for remaining drkonqi instances with timeout (in seconds)
-     wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-     wait_drkonqi_counter=0
--    while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-+    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-         sleep 5
-         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
-         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
-             # ask remaining drkonqis to die in a graceful way
--            qdbus | grep 'org.kde.drkonqi-' | while read address ; do
--                qdbus "$address" "/MainApplication" "quit"
-+            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
-+                $qdbus "$address" "/MainApplication" "quit"
-             done
-             break
-         fi
-diff -up plasma-workspace-5.12.5/startkde/startplasma.cmake.startkde plasma-workspace-5.12.5/startkde/startplasma.cmake
---- plasma-workspace-5.12.5/startkde/startplasma.cmake.startkde 2018-05-01 08:03:40.000000000 -0500
-+++ plasma-workspace-5.12.5/startkde/startplasma.cmake  2018-05-06 21:11:54.749023404 -0500
-@@ -140,7 +140,8 @@ if test $? -ne 0; then
-   exit 1
- fi
- 
--qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
-+qdbus=qdbus-qt5
-+$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
- 
- # finally, give the session control to the session manager
- # see kdebase/ksmserver for the description of the rest of the startup sequence
-@@ -169,13 +170,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t
-     # wait for remaining drkonqi instances with timeout (in seconds)
-     wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-     wait_drkonqi_counter=0
--    while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-+    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-         sleep 5
-         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
-         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
-             # ask remaining drkonqis to die in a graceful way
--            qdbus | grep 'org.kde.drkonqi-' | while read address ; do
--                qdbus "$address" "/MainApplication" "quit"
-+            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
-+                $qdbus "$address" "/MainApplication" "quit"
-             done
-             break
-         fi
-diff -up plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake.startkde plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake
---- plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake.startkde       2018-05-01 08:03:40.000000000 -0500
-+++ plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake        2018-05-06 21:11:54.749023404 -0500
-@@ -3,6 +3,8 @@
- #  DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
- #
-
-+qdbus=qdbus-qt5
-+
- # We need to create config folder so we can write startupconfigkeys
- if [  ${XDG_CONFIG_HOME} ]; then
-   configDir=$XDG_CONFIG_HOME;
-@@ -120,12 +122,12 @@ fi
-
- # Get a property value from org.freedesktop.locale1
- queryLocale1() {
--    qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
-+    $qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
- }
-
- # Query whether org.freedesktop.locale1 is available. If it is, try to
- # set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly.
--if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
-+if $qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
-     # Do not overwrite existing values. There is no point in setting only some
-     # of them as then they would not match anymore.
-     if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \
-@@ -175,7 +177,7 @@ fi
- export XDG_DATA_DIRS
-
- # Make sure that D-Bus is running
--if qdbus >/dev/null 2>/dev/null; then
-+if $qdbus >/dev/null 2>/dev/null; then
-     : # ok
- else
-     echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?'  1>&2