[rpms/plasma-bigscreen] epel10: Upgrade to qt6

[rpms/plasma-bigscreen] epel10: Upgrade to qt6

[Steve Cossette]

A new commit has been pushed.

Repo   : rpms/plasma-bigscreen
Branch : epel10
Commit : 7a106025dcaac3f30cfe3a160f5adb3aaaff69ff
Author : Steve Cossette <farchord@gmail.com>
Date   : 2024-02-05T06:42:44-05:00
Stats  : +64/-70 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/plasma-bigscreen/c/7a106025dcaac3f30cfe3a160f5adb3aaaff69ff?branch=epel10

Log:
Upgrade to qt6

---
diff --git a/.gitignore b/.gitignore
index e2260fa..8dc1d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /plasma-bigscreen-5.27.8.tar.xz
 /plasma-bigscreen-5.27.9.tar.xz
+/plasma-bigscreen-046d404e34aa04f4deddddd40e8bdf40dfa43d05.tar.gz

diff --git a/plasma-bigscreen.spec b/plasma-bigscreen.spec
index 6b7070b..c10dad1 100644
--- a/plasma-bigscreen.spec
+++ b/plasma-bigscreen.spec
@@ -5,47 +5,54 @@
 %bcond_without wayland_default
 %endif
 
+%global commit 046d404e34aa04f4deddddd40e8bdf40dfa43d05
+%global shortcommit 046d404
+%global gitdate 20240204.214319
+
 Name:          plasma-bigscreen
-Version:       5.27.9
-Release:       3%{?dist}
+Version:       5.27.80~%{gitdate}.%{shortcommit}
+Release:       1%{?dist}
 License:       BSD-2-Clause and BSD-3-Clause and CC0-1.0 and GPL-2.0-or-later and CC-BY-SA-4.0
 Summary:       A big launcher giving you access to any installed apps and skills
 Url:           https://invent.kde.org/plasma/plasma-bigscreen
 
-%global        stable %stable_kf5
-Source0:       http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
+# Not currently in the plasma releases. Getting from gitlab tags.
+# Source0:       http://download.kde.org/%{stable_kf6}/plasma/%{version}/%{name}-%{version}.tar.xz
+Source0:       https://invent.kde.org/plasma/%{name}/-/archive/%{commit}/%{name}-%{commit}.tar.gz
 
 BuildRequires: extra-cmake-modules
 BuildRequires: gcc-c++
-BuildRequires: kf5-rpm-macros
-BuildRequires: cmake(KF5Activities)
-BuildRequires: cmake(KF5ActivitiesStats)
-BuildRequires: cmake(KF5Plasma)
-BuildRequires: cmake(KF5I18n)
-BuildRequires: cmake(KF5Kirigami2)
-BuildRequires: cmake(KF5Declarative)
-BuildRequires: cmake(KF5KCMUtils)
-BuildRequires: cmake(KF5Notifications)
-BuildRequires: cmake(KF5PlasmaQuick)
-BuildRequires: cmake(KF5KIO)
-BuildRequires: cmake(KF5Wayland)
-BuildRequires: cmake(KF5WindowSystem)
-BuildRequires: cmake(libkworkspace)
-BuildRequires: cmake(Qt5Quick)
-BuildRequires: cmake(Qt5Core)
-BuildRequires: cmake(Qt5Qml)
-BuildRequires: cmake(Qt5DBus)
-BuildRequires: cmake(Qt5Network)
-BuildRequires: cmake(Qt5Multimedia)
+BuildRequires: kf6-rpm-macros
+BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
+
+BuildRequires: cmake(KF6I18n)
+BuildRequires: cmake(KF6Kirigami2)
+BuildRequires: cmake(KF6KCMUtils)
+BuildRequires: cmake(KF6Notifications)
+BuildRequires: cmake(KF6KIO)
+BuildRequires: cmake(KF6WindowSystem)
+BuildRequires: cmake(KF6Svg)
+
+BuildRequires: cmake(Plasma)
+BuildRequires: cmake(PlasmaActivities)
+BuildRequires: cmake(PlasmaActivitiesStats)
+
+BuildRequires: cmake(LibKWorkspace)
+
+BuildRequires: cmake(Qt6Quick)
+BuildRequires: cmake(Qt6Core)
+BuildRequires: cmake(Qt6Qml)
+BuildRequires: cmake(Qt6DBus)
+BuildRequires: cmake(Qt6Network)
+BuildRequires: cmake(Qt6Multimedia)
 
 
 # Require Xorg/Wayland sessions appropriately
 %if ! %{with wayland_default}
 Recommends: %{name}-wayland = %{version}-%{release}
-Requires:   %{name}-x11 = %{version}-%{release}
 %else
 Requires:   %{name}-wayland = %{version}-%{release}
-Recommends: %{name}-x11 = %{version}-%{release}
 %endif
 
 
@@ -54,78 +61,64 @@ Summary:   Wayland support for %{name}
 BuildArch: noarch
 Requires:  %{name} = %{version}-%{release}
 Requires:  plasma-workspace-wayland >= %{version}
-
+# Transition users upgrading from F39 and before to the wayland session
+Obsoletes: %{name}-x11 < %{version}-%{release}
+Conflicts: %{name}-x11 < %{version}-%{release}
 
 %description wayland
 %{summary}
 
 
-%package  x11
-BuildArch: noarch
-Summary:   X11 support for %{name}
-Requires:  %{name} = %{version}-%{release}
-Requires:  plasma-workspace-x11 >= %{version}
-
-
-%description x11
-%{summary}
-
-
 
 %description
 %{summary}
 
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{commit}
 
 
 %build
-%cmake_kf5
+%cmake_kf6
 %cmake_build
 
 
 %install
 %cmake_install
-chmod +x %{buildroot}%{_kf5_bindir}/mycroft-skill-launcher.py
-
+chmod +x %{buildroot}%{_kf6_bindir}/mycroft-skill-launcher.py
+# F40: Remove the X11 Launcher
+rm -v %{buildroot}%{_kf6_bindir}/plasma-bigscreen-x11
+rm -v %{buildroot}%{_kf6_datadir}/xsessions/plasma-bigscreen-x11.desktop
 %find_lang plasma-bigscreen --with-man --with-qt --all-name
 
+%check
+desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/kcm_mediacenter_{audiodevice,bigscreen_settings,kdeconnect,wifi}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
 
 %files -f plasma-bigscreen.lang
 %license LICENSES/*
-%{_kf5_bindir}/mycroft-skill-launcher.py
-%{_kf5_qtplugindir}/kcms/kcm_mediacenter_*.so
-%{_kf5_qtplugindir}/plasma/applets/plasma_containment_biglauncherhomescreen.so
-%{_kf5_qmldir}/org/kde/mycroft/bigscreen/
-%{_kf5_datadir}/kpackage/genericqml/org.kde.plasma.settings/contents/ui/+mediacenter/*.qml
-%{_kf5_datadir}/kpackage/kcms/kcm_mediacenter_audiodevice/
-%{_kf5_datadir}/kpackage/kcms/kcm_mediacenter_bigscreen_settings/
-%{_kf5_datadir}/kpackage/kcms/kcm_mediacenter_kdeconnect/
-%{_kf5_datadir}/kpackage/kcms/kcm_mediacenter_wifi/
-%{_kf5_datadir}/kservices5/plasma-applet-org.kde.mycroft.bigscreen.homescreen.desktop
-%{_kf5_datadir}/kservices5/plasma-applet-org.kde.plasma.mycroft.bigscreen.desktop
-%{_kf5_datadir}/kservices5/plasma-lookandfeel-org.kde.plasma.mycroft.bigscreen.desktop
-%{_kf5_metainfodir}/org.kde.mycroft.bigscreen.homescreen.appdata.xml
-%{_kf5_metainfodir}/org.kde.plasma.mycroft.bigscreen.appdata.xml
-%{_kf5_metainfodir}/org.kde.plasma.mycroft.bigscreen.metainfo.xml
-%{_kf5_datadir}/plasma/look-and-feel/org.kde.plasma.mycroft.bigscreen/
-%{_kf5_datadir}/plasma/plasmoids/org.kde.mycroft.bigscreen.homescreen/
-%{_kf5_datadir}/plasma/shells/org.kde.plasma.mycroft.bigscreen/
-%{_kf5_datadir}/sounds/plasma-bigscreen/
-
+%{_kf6_bindir}/mycroft-skill-launcher.py
+%{_kf6_qtplugindir}/kcms/kcm_mediacenter_*.so
+%{_kf6_qmldir}/org/kde/mycroft/bigscreen/
+%{_kf6_datadir}/kpackage/genericqml/org.kde.plasma.settings/contents/ui/+mediacenter/*.qml
+%{_kf6_metainfodir}/org.kde.plasma.mycroft.bigscreen.appdata.xml
+%{_kf6_metainfodir}/org.kde.plasma.mycroft.bigscreen.metainfo.xml
+%{_kf6_datadir}/plasma/look-and-feel/org.kde.plasma.mycroft.bigscreen/
+%{_kf6_datadir}/plasma/plasmoids/org.kde.mycroft.bigscreen.homescreen/
+%{_kf6_datadir}/plasma/shells/org.kde.plasma.mycroft.bigscreen/
+%{_kf6_datadir}/sounds/plasma-bigscreen/
+%{_kf6_qtplugindir}/plasma/applets/org.kde.mycroft.bigscreen.homescreen.so
+%{_kf6_datadir}/applications/kcm_mediacenter_*.desktop
 
 %files wayland
-%{_kf5_bindir}/plasma-bigscreen-wayland
-%{_kf5_datadir}/wayland-sessions/plasma-bigscreen-wayland.desktop
-
-
-%files x11
-%{_kf5_bindir}/plasma-bigscreen-x11
-%{_kf5_datadir}/xsessions/plasma-bigscreen-x11.desktop
+%{_kf6_bindir}/plasma-bigscreen-wayland
+%{_kf6_datadir}/wayland-sessions/plasma-bigscreen-wayland.desktop
 
 
 %changelog
+* Mon Feb 05 2024 Steve Cossette <farchord@gmail.com> - 5.27.80~20240204.214319.046d404-1
+- Updated to Qt6
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.27.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

diff --git a/sources b/sources
index 2554cf8..e5ea781 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (plasma-bigscreen-5.27.9.tar.xz) = 9a2761641bdc1f0187212b78536f18498131c9a66a820f71dbf057ac35463ad1493372adf8ec785d4a9a77b51e0812b0de2aa00aff157997c9f3d77fedef853d
+SHA512 (plasma-bigscreen-046d404e34aa04f4deddddd40e8bdf40dfa43d05.tar.gz) = fa00f94eae4b04f9d138363298fa1509273f42c89edf6b34862c913e380286e93a72d7b96d44f116d0863fc06f714dce49016a49a7c0b0d0537a6dfdc9ada56c