diff --git a/copr-build.sh b/copr-build.sh index b725303..bd5b884 100755 --- a/copr-build.sh +++ b/copr-build.sh @@ -1,9 +1,9 @@ #!/bin/bash set -e -COPR="${COPR:-@SonicDE/SonicDE-EL10}" +COPR="${COPR:-@SonicDE/SonicDE-EL10-dev}" GIT_URL="${GIT_URL:-https://pc-rytteren.dk/forge/anders/SonicDE-rpmspecs.git}" -BRANCH="${BRANCH:-master}" +BRANCH="${BRANCH:-hardfork}" METHOD="${METHOD:-rpkg}" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" diff --git a/sonic-accounts-integration/sonic-accounts-integration.spec b/sonic-accounts-integration/sonic-accounts-integration.spec index c3f1cf2..4ff0dad 100644 --- a/sonic-accounts-integration/sonic-accounts-integration.spec +++ b/sonic-accounts-integration/sonic-accounts-integration.spec @@ -7,12 +7,9 @@ # Upstream KDE project: kaccounts-integration %global oldname kaccounts-integration -# EPEL10 does not have kf5 -%if 0%{?rhel} && 0%{?rhel} >= 10 +# SonicDE is a Qt6/KF6-only hard fork; no KF5 packages are shipped, so the +# Qt5/KF5 compat build is never produced. %bcond_with kf5 -%else -%bcond_without kf5 -%endif #Name: kaccounts-integration Name: sonic-accounts-integration @@ -178,7 +175,7 @@ pushd %{oldname}_qt5 popd %endif -%files qt6 -f %{name}.lang +%files qt6 -f %{oldname}.lang %doc README* %license LICENSES/* %{_kf6_datadir}/applications/kcm_kaccounts.desktop diff --git a/sonic-audio-applet-pulse/sonic-audio-applet-pulse.spec b/sonic-audio-applet-pulse/sonic-audio-applet-pulse.spec index eeb3942..ac628b1 100644 --- a/sonic-audio-applet-pulse/sonic-audio-applet-pulse.spec +++ b/sonic-audio-applet-pulse/sonic-audio-applet-pulse.spec @@ -84,7 +84,7 @@ Conflicts: plasma-pa < %{version}-%{release} rm -fv %{buildroot}%{_kf6_libdir}/libplasma-volume.so -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/* %{_kf6_qmldir}/org/kde/plasma/private/volume/ %{_kf6_qtplugindir}/plasma/kcms/systemsettings/kcm_pulseaudio.so diff --git a/sonic-bluetooth-runtime/sonic-bluetooth-runtime.spec b/sonic-bluetooth-runtime/sonic-bluetooth-runtime.spec index 58b6485..80916b2 100644 --- a/sonic-bluetooth-runtime/sonic-bluetooth-runtime.spec +++ b/sonic-bluetooth-runtime/sonic-bluetooth-runtime.spec @@ -95,7 +95,7 @@ desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.bluedevil desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.bluedevilwizard.desktop -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README %{_datadir}/mime/packages/bluedevil-mime.xml %{_kf6_bindir}/bluedevil-sendfile diff --git a/sonic-breeze/sonic-breeze.spec b/sonic-breeze/sonic-breeze.spec index 02e5df3..edfa031 100644 --- a/sonic-breeze/sonic-breeze.spec +++ b/sonic-breeze/sonic-breeze.spec @@ -8,12 +8,8 @@ %global oldname plasma-breeze %global base_name breeze -# EPEL10 does not have kf5 -%if 0%{?rhel} && 0%{?rhel} >= 10 +# SonicDE is a Qt6/KF6-only hard fork; no KF5 packages are shipped. %bcond_with kf5 -%else -%bcond_without kf5 -%endif #Name: plasma-breeze Name: sonic-breeze diff --git a/sonic-browser-integration/sonic-browser-integration.spec b/sonic-browser-integration/sonic-browser-integration.spec index ef5d8be..b3324d6 100644 --- a/sonic-browser-integration/sonic-browser-integration.spec +++ b/sonic-browser-integration/sonic-browser-integration.spec @@ -80,7 +80,7 @@ https://community.kde.org/Plasma/Browser_Integration %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/* %config %{_sysconfdir}/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json %config %{_sysconfdir}/opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json diff --git a/sonic-crypto-library/sonic-crypto-library.spec b/sonic-crypto-library/sonic-crypto-library.spec index f7c1daf..db231d8 100644 --- a/sonic-crypto-library/sonic-crypto-library.spec +++ b/sonic-crypto-library/sonic-crypto-library.spec @@ -11,7 +11,8 @@ %global botan 1 %endif -%bcond_without qt5 +# SonicDE is a Qt6-only hard fork; no Qt5 variant is built. +%bcond_with qt5 %bcond_without qt6 #global doc 1 @@ -349,8 +350,10 @@ cmake_opts="-Wno-dev \ %install +%if %{with qt5} %define _vpath_builddir %{_target_platform}-qt5 %cmake_install +%endif %if %{with qt6} %define _vpath_builddir %{_target_platform}-qt6 diff --git a/sonic-desktop-interface/sonic-desktop-interface.spec b/sonic-desktop-interface/sonic-desktop-interface.spec index ed28ec0..ccf6e08 100644 --- a/sonic-desktop-interface/sonic-desktop-interface.spec +++ b/sonic-desktop-interface/sonic-desktop-interface.spec @@ -280,7 +280,7 @@ BuildArch: noarch %install %cmake_install -%find_lang %{name} --with-html --all-name +%find_lang plasmadesktop6 --with-html --all-name grep "%{_kf6_docdir}" %{name}.lang > %{name}-doc.lang cat %{name}.lang %{name}-doc.lang | sort | uniq -u > plasmadesktop6.lang @@ -389,7 +389,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kaccess.desktop %{_libexecdir}/kimpanel-scim-panel %endif -%files doc -f %{name}-doc.lang +%files doc -f plasmadesktop6-doc.lang %changelog diff --git a/sonic-disks/sonic-disks.spec b/sonic-disks/sonic-disks.spec index dc78468..20f681c 100644 --- a/sonic-disks/sonic-disks.spec +++ b/sonic-disks/sonic-disks.spec @@ -72,7 +72,7 @@ signs of imminent failure appear. %check desktop-file-validate %{buildroot}/%{_datadir}/applications/kcm_disks.desktop -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/*.txt %{_libexecdir}/kf6/kauth/kded-smart-helper %{_qt6_plugindir}/plasma/kcms/kinfocenter/kcm_disks.so diff --git a/sonic-dr-robotnik/sonic-dr-robotnik.spec b/sonic-dr-robotnik/sonic-dr-robotnik.spec index c24e9b8..aae8729 100644 --- a/sonic-dr-robotnik/sonic-dr-robotnik.spec +++ b/sonic-dr-robotnik/sonic-dr-robotnik.spec @@ -93,7 +93,7 @@ Conflicts: plasma-drkonqi < %{version}-%{release} install -p -D -m755 src/doc/examples/installdbgsymbols_fedora.sh \ %{buildroot}%{_libexecdir}/installdbgsymbols.sh -%find_lang all --with-html --with-qt --all-name +%find_lang plasma-drkonqi --with-html --with-qt --all-name grep drkonqi.mo all.lang > plasma-drkonqi.lang %post diff --git a/sonic-drawing-tablet/sonic-drawing-tablet.spec b/sonic-drawing-tablet/sonic-drawing-tablet.spec index f66337d..0273bf8 100644 --- a/sonic-drawing-tablet/sonic-drawing-tablet.spec +++ b/sonic-drawing-tablet/sonic-drawing-tablet.spec @@ -86,7 +86,7 @@ with profile support to handle different button/pen layouts per profile. %find_lang %{oldname} --all-name --with-html -%files -f %{name}.lang +%files -f %{oldname}.lang %doc AUTHORS %license COPYING* %{_datadir}/dbus-1/interfaces/org.kde.Wacom*.xml diff --git a/sonic-firewall/sonic-firewall.spec b/sonic-firewall/sonic-firewall.spec index fd16c9d..6c4a48c 100644 --- a/sonic-firewall/sonic-firewall.spec +++ b/sonic-firewall/sonic-firewall.spec @@ -108,7 +108,7 @@ to interface with the Uncomplicated Firewall (UFW). appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml || : desktop-file-validate %{buildroot}%{_datadir}/applications/kcm_firewall.desktop -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/*.txt %{_libdir}/libkcm_firewall_core.so %{_qt6_plugindir}/plasma/kcms/systemsettings/kcm_firewall.so diff --git a/sonic-frameworks-addons-downloader/sonic-frameworks-addons-downloader.spec b/sonic-frameworks-addons-downloader/sonic-frameworks-addons-downloader.spec index 5cadf1f..5506e90 100644 --- a/sonic-frameworks-addons-downloader/sonic-frameworks-addons-downloader.spec +++ b/sonic-frameworks-addons-downloader/sonic-frameworks-addons-downloader.spec @@ -97,7 +97,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %dir %{_kf6_qmldir}/org/ %dir %{_kf6_qmldir}/org/kde %doc README.md diff --git a/sonic-frameworks-app-info/sonic-frameworks-app-info.spec b/sonic-frameworks-app-info/sonic-frameworks-app-info.spec index ad96e39..6782cf2 100644 --- a/sonic-frameworks-app-info/sonic-frameworks-app-info.spec +++ b/sonic-frameworks-app-info/sonic-frameworks-app-info.spec @@ -92,7 +92,7 @@ Developer Documentation files for %{name} in HTML format mkdir -p %{buildroot}%{_kf6_datadir}/kservices6 mkdir -p %{buildroot}%{_kf6_datadir}/kservicetypes6 -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_datadir}/qlogging-categories6/%{framework}.* diff --git a/sonic-frameworks-bluetooth/sonic-frameworks-bluetooth.spec b/sonic-frameworks-bluetooth/sonic-frameworks-bluetooth.spec index b197f4c..8ced55c 100644 --- a/sonic-frameworks-bluetooth/sonic-frameworks-bluetooth.spec +++ b/sonic-frameworks-bluetooth/sonic-frameworks-bluetooth.spec @@ -34,7 +34,7 @@ BuildRequires: cmake # For %%{_udevrulesdir} BuildRequires: systemd -Requires: kf6-filesystem >= %{version} +Requires: kf6-filesystem Recommends: bluez >= 5 Provides: kf6-bluez-qt = %{version}-%{release} diff --git a/sonic-frameworks-doctools/sonic-frameworks-doctools.spec b/sonic-frameworks-doctools/sonic-frameworks-doctools.spec index 88fdcaf..51e8765 100644 --- a/sonic-frameworks-doctools/sonic-frameworks-doctools.spec +++ b/sonic-frameworks-doctools/sonic-frameworks-doctools.spec @@ -88,7 +88,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name --with-man --with-html -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_libdir}/libKF6DocTools.so.6 diff --git a/sonic-frameworks-file-metadata/sonic-frameworks-file-metadata.spec b/sonic-frameworks-file-metadata/sonic-frameworks-file-metadata.spec index 60b1f20..6597e1a 100644 --- a/sonic-frameworks-file-metadata/sonic-frameworks-file-metadata.spec +++ b/sonic-frameworks-file-metadata/sonic-frameworks-file-metadata.spec @@ -96,7 +96,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name mkdir -p %{buildroot}%{_kf6_plugindir}/kfilemetadata/writers/ -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/*.txt %{_kf6_bindir}/kfilemetadata_dump6 %{_kf6_datadir}/qlogging-categories6/%{framework}* diff --git a/sonic-frameworks-file-search/sonic-frameworks-file-search.spec b/sonic-frameworks-file-search/sonic-frameworks-file-search.spec index faaff3d..31c5796 100644 --- a/sonic-frameworks-file-search/sonic-frameworks-file-search.spec +++ b/sonic-frameworks-file-search/sonic-frameworks-file-search.spec @@ -138,7 +138,7 @@ cat kio6_tags.lang kio6_baloosearch.lang kio6_timeline.lang \ cat baloo_file6.lang baloo_file_extractor6.lang \ > %{oldname}-file.lang -%files -f %{name}.lang +%files -f baloodb6.lang %license LICENSES/*.txt %{_kf6_bindir}/baloosearch6 %{_kf6_bindir}/balooshow6 diff --git a/sonic-frameworks-icon-themes/sonic-frameworks-icon-themes.spec b/sonic-frameworks-icon-themes/sonic-frameworks-icon-themes.spec index 9bf4586..addd9ba 100644 --- a/sonic-frameworks-icon-themes/sonic-frameworks-icon-themes.spec +++ b/sonic-frameworks-icon-themes/sonic-frameworks-icon-themes.spec @@ -93,7 +93,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_bindir}/kiconfinder6 diff --git a/sonic-frameworks-idle-tracker/sonic-frameworks-idle-tracker.spec b/sonic-frameworks-idle-tracker/sonic-frameworks-idle-tracker.spec index e194b1d..7f36c02 100644 --- a/sonic-frameworks-idle-tracker/sonic-frameworks-idle-tracker.spec +++ b/sonic-frameworks-idle-tracker/sonic-frameworks-idle-tracker.spec @@ -8,7 +8,8 @@ %global oldname kf6-kidletime # Disable X11 for RHEL -%bcond x11 %[%{undefined rhel}] +# SonicDE is X11-only, so the X11 plugin is always built. +%bcond_without x11 %global framework kidletime @@ -116,8 +117,7 @@ Developer Documentation files for %{name} in HTML format %if %{with x11} %files x11 -%{_kf6_plugindir}/org.kde.kidletime.platforms/KF6IdleTimeXcbPlugin0.so -%{_kf6_plugindir}/org.kde.kidletime.platforms/KF6IdleTimeXcbPlugin1.so +%{_kf6_plugindir}/org.kde.kidletime.platforms/KF6IdleTimeXcbPlugin*.so %endif %files devel diff --git a/sonic-frameworks-image-formats/sonic-frameworks-image-formats.spec b/sonic-frameworks-image-formats/sonic-frameworks-image-formats.spec index 54afbd2..0ee3488 100644 --- a/sonic-frameworks-image-formats/sonic-frameworks-image-formats.spec +++ b/sonic-frameworks-image-formats/sonic-frameworks-image-formats.spec @@ -76,7 +76,7 @@ developing applications that use %{name}. %build %cmake_kf6 \ - -DKIMAGEFORMATS_HEIF:BOOL=ON \ + -DKIMAGEFORMATS_HEIF:BOOL=OFF \ -DKIMAGEFORMATS_JXR:BOOL=ON %cmake_build diff --git a/sonic-frameworks-internationalization/sonic-frameworks-internationalization.spec b/sonic-frameworks-internationalization/sonic-frameworks-internationalization.spec index 71a4a6a..f37ebf0 100644 --- a/sonic-frameworks-internationalization/sonic-frameworks-internationalization.spec +++ b/sonic-frameworks-internationalization/sonic-frameworks-internationalization.spec @@ -85,7 +85,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_libdir}/libKF6I18n.so.6 diff --git a/sonic-frameworks-io-extras/sonic-frameworks-io-extras.spec b/sonic-frameworks-io-extras/sonic-frameworks-io-extras.spec index c4044aa..dc4f33c 100644 --- a/sonic-frameworks-io-extras/sonic-frameworks-io-extras.spec +++ b/sonic-frameworks-io-extras/sonic-frameworks-io-extras.spec @@ -115,7 +115,7 @@ Conflicts: kio-extras-devel < %{version}-%{release} %find_lang %{oldname} --all-name --with-html -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/* %{_kf6_plugindir}/kded/ diff --git a/sonic-frameworks-io/sonic-frameworks-io.spec b/sonic-frameworks-io/sonic-frameworks-io.spec index 88ba3d9..354dabf 100644 --- a/sonic-frameworks-io/sonic-frameworks-io.spec +++ b/sonic-frameworks-io/sonic-frameworks-io.spec @@ -242,7 +242,7 @@ Developer Documentation files for %{name} in HTML format %files core-libs %{_kf6_libdir}/libKF6KIOCore.so.* -%files doc -f %{name}.lang +%files doc -f %{oldname}.lang %files gui %{_kf6_libdir}/libKF6KIOGui.so.* diff --git a/sonic-frameworks-keyring/sonic-frameworks-keyring.spec b/sonic-frameworks-keyring/sonic-frameworks-keyring.spec index 0722a2a..49a01e9 100644 --- a/sonic-frameworks-keyring/sonic-frameworks-keyring.spec +++ b/sonic-frameworks-keyring/sonic-frameworks-keyring.spec @@ -115,7 +115,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name --with-man -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_bindir}/kwallet-query diff --git a/sonic-frameworks-notification-settings/sonic-frameworks-notification-settings.spec b/sonic-frameworks-notification-settings/sonic-frameworks-notification-settings.spec index afb9e50..563ec57 100644 --- a/sonic-frameworks-notification-settings/sonic-frameworks-notification-settings.spec +++ b/sonic-frameworks-notification-settings/sonic-frameworks-notification-settings.spec @@ -87,7 +87,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_datadir}/qlogging-categories6/*%{framework}.* diff --git a/sonic-frameworks-package/sonic-frameworks-package.spec b/sonic-frameworks-package/sonic-frameworks-package.spec index a911e6a..7ff3d06 100644 --- a/sonic-frameworks-package/sonic-frameworks-package.spec +++ b/sonic-frameworks-package/sonic-frameworks-package.spec @@ -23,7 +23,7 @@ URL: https://github.com/Sonic-DE/%{reponame} Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{reponame}-%{version}.tar.gz #Source1: https://download.kde.org/%%{stable_kf6}/frameworks/%%{majmin_ver_kf6}/%%{framework}-%%{version}.tar.xz.sig -BuildRequires: sonic-frameworks-cmake-modules >= %{version} +BuildRequires: sonic-frameworks-cmake-modules BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: sonic-rpm-macros @@ -85,7 +85,7 @@ Developer Documentation files for %{name} in HTML format mkdir -p %{buildroot}%{_kf6_qtplugindir}/kpackage/packagestructure/ mkdir -p %{buildroot}%{_kf6_datadir}/kpackage/ -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_datadir}/qlogging-categories6/%{framework}.* diff --git a/sonic-frameworks-pseudo-terminal/sonic-frameworks-pseudo-terminal.spec b/sonic-frameworks-pseudo-terminal/sonic-frameworks-pseudo-terminal.spec index 9c8a30e..846b2d4 100644 --- a/sonic-frameworks-pseudo-terminal/sonic-frameworks-pseudo-terminal.spec +++ b/sonic-frameworks-pseudo-terminal/sonic-frameworks-pseudo-terminal.spec @@ -84,7 +84,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name --with-man -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_datadir}/qlogging-categories6/%{framework}.* diff --git a/sonic-frameworks-purpose/sonic-frameworks-purpose.spec b/sonic-frameworks-purpose/sonic-frameworks-purpose.spec index e2582d8..3d29fb4 100644 --- a/sonic-frameworks-purpose/sonic-frameworks-purpose.spec +++ b/sonic-frameworks-purpose/sonic-frameworks-purpose.spec @@ -105,7 +105,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_datadir}/qlogging-categories6/%{framework}.* diff --git a/sonic-frameworks-qml-bridge/sonic-frameworks-qml-bridge.spec b/sonic-frameworks-qml-bridge/sonic-frameworks-qml-bridge.spec index 5014248..e88416c 100644 --- a/sonic-frameworks-qml-bridge/sonic-frameworks-qml-bridge.spec +++ b/sonic-frameworks-qml-bridge/sonic-frameworks-qml-bridge.spec @@ -93,7 +93,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_libdir}/libKF6CalendarEvents.so.* diff --git a/sonic-frameworks-quick-desktop-style/sonic-frameworks-quick-desktop-style.spec b/sonic-frameworks-quick-desktop-style/sonic-frameworks-quick-desktop-style.spec index dd581ff..841009a 100644 --- a/sonic-frameworks-quick-desktop-style/sonic-frameworks-quick-desktop-style.spec +++ b/sonic-frameworks-quick-desktop-style/sonic-frameworks-quick-desktop-style.spec @@ -61,7 +61,7 @@ between QWidget-based and QML-based apps. %cmake_install %find_lang %{oldname} --all-name --with-man --with-qt -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_libdir}/cmake/KF6QQC2DesktopStyle/ diff --git a/sonic-frameworks-quick-ui/sonic-frameworks-quick-ui.spec b/sonic-frameworks-quick-ui/sonic-frameworks-quick-ui.spec index b893732..38c2356 100644 --- a/sonic-frameworks-quick-ui/sonic-frameworks-quick-ui.spec +++ b/sonic-frameworks-quick-ui/sonic-frameworks-quick-ui.spec @@ -88,8 +88,10 @@ Developer Documentation files for %{name} in HTML format %install %cmake_install_kf6 %find_lang_kf6 libkirigami6_qt +%find_lang_kf6 libkirigami2plugin_qt +cat libkirigami6_qt.lang libkirigami2plugin_qt.lang > all.lang -%files -f libkirigami6_qt.lang +%files -f all.lang %doc README.md %dir %{_kf6_qmldir}/org/ %dir %{_kf6_qmldir}/org/kde/ @@ -97,29 +99,29 @@ Developer Documentation files for %{name} in HTML format %{_kf6_qmldir}/org/kde/kirigami %{_datadir}/qlogging-categories6/kirigami.categories %{_kf6_libdir}/libKirigami.so.6 -%{_kf6_libdir}/libKirigami.so.%{version} +%{_kf6_libdir}/libKirigami.so.6.* %{_kf6_libdir}/libKirigamiDelegates.so.6 -%{_kf6_libdir}/libKirigamiDelegates.so.%{version} +%{_kf6_libdir}/libKirigamiDelegates.so.6.* %{_kf6_libdir}/libKirigamiDialogs.so.6 -%{_kf6_libdir}/libKirigamiDialogs.so.%{version} +%{_kf6_libdir}/libKirigamiDialogs.so.6.* %{_kf6_libdir}/libKirigamiLayouts.so.6 -%{_kf6_libdir}/libKirigamiLayouts.so.%{version} +%{_kf6_libdir}/libKirigamiLayouts.so.6.* %{_kf6_libdir}/libKirigamiLayoutsPrivate.so.6 -%{_kf6_libdir}/libKirigamiLayoutsPrivate.so.%{version} +%{_kf6_libdir}/libKirigamiLayoutsPrivate.so.6.* %{_kf6_libdir}/libKirigamiPlatform.so.6 -%{_kf6_libdir}/libKirigamiPlatform.so.%{version} +%{_kf6_libdir}/libKirigamiPlatform.so.6.* %{_kf6_libdir}/libKirigamiPrimitives.so.6 -%{_kf6_libdir}/libKirigamiPrimitives.so.%{version} +%{_kf6_libdir}/libKirigamiPrimitives.so.6.* %{_kf6_libdir}/libKirigamiPrivate.so.6 -%{_kf6_libdir}/libKirigamiPrivate.so.%{version} +%{_kf6_libdir}/libKirigamiPrivate.so.6.* %{_kf6_libdir}/libKirigamiPolyfill.so.6 -%{_kf6_libdir}/libKirigamiPolyfill.so.%{version} +%{_kf6_libdir}/libKirigamiPolyfill.so.6.* %{_kf6_libdir}/libKirigamiTemplates.so.6 -%{_kf6_libdir}/libKirigamiTemplates.so.%{version} +%{_kf6_libdir}/libKirigamiTemplates.so.6.* %{_kf6_libdir}/libKirigamiControls.so.6 -%{_kf6_libdir}/libKirigamiControls.so.%{version} +%{_kf6_libdir}/libKirigamiControls.so.6.* %{_kf6_libdir}/libKirigamiForms*.so.6 -%{_kf6_libdir}/libKirigamiForms*.so.%{version} +%{_kf6_libdir}/libKirigamiForms*.so.6.* %files devel %dir %{_kf6_datadir}/kdevappwizard/ diff --git a/sonic-frameworks-settings-ui/sonic-frameworks-settings-ui.spec b/sonic-frameworks-settings-ui/sonic-frameworks-settings-ui.spec index a3c4b69..cd88719 100644 --- a/sonic-frameworks-settings-ui/sonic-frameworks-settings-ui.spec +++ b/sonic-frameworks-settings-ui/sonic-frameworks-settings-ui.spec @@ -96,7 +96,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --with-man --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_libdir}/libKF6ConfigWidgets.so.* diff --git a/sonic-frameworks-settings-utils/sonic-frameworks-settings-utils.spec b/sonic-frameworks-settings-utils/sonic-frameworks-settings-utils.spec index d3c3bb2..e6ccdd8 100644 --- a/sonic-frameworks-settings-utils/sonic-frameworks-settings-utils.spec +++ b/sonic-frameworks-settings-utils/sonic-frameworks-settings-utils.spec @@ -97,7 +97,7 @@ Developer Documentation files for %{name} in HTML format # create/own dirs mkdir -p %{buildroot}%{_kf6_qtplugindir}/kcms -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_bindir}/kcmshell6 diff --git a/sonic-frameworks-silver-icons/sonic-frameworks-silver-icons.spec b/sonic-frameworks-silver-icons/sonic-frameworks-silver-icons.spec index 6317613..c870ca2 100644 --- a/sonic-frameworks-silver-icons/sonic-frameworks-silver-icons.spec +++ b/sonic-frameworks-silver-icons/sonic-frameworks-silver-icons.spec @@ -149,25 +149,25 @@ hardlink -c -v %{buildroot}%{_datadir}/icons/ du -s . # %%ghost icon.cache -touch %{buildroot}%{_kf6_datadir}/icons/{breeze,breeze-dark}/icon-theme.cache +touch %{buildroot}%{_kf6_datadir}/icons/{silver,silver-dark}/icon-theme.cache %if 0%{?fedora} -install -pm 0644 icons-fedora/apps/48/org.fedoraproject.AnacondaInstaller.svg %{buildroot}%{_kf6_datadir}/icons/breeze/apps/48 -ln -sr %{buildroot}%{_kf6_datadir}/icons/breeze/apps/48/org.fedoraproject.AnacondaInstaller.svg %{buildroot}%{_kf6_datadir}/icons/breeze-dark/apps/48/org.fedoraproject.AnacondaInstaller.svg +install -pm 0644 icons-fedora/apps/48/org.fedoraproject.AnacondaInstaller.svg %{buildroot}%{_kf6_datadir}/icons/silver/apps/48 +ln -sr %{buildroot}%{_kf6_datadir}/icons/silver/apps/48/org.fedoraproject.AnacondaInstaller.svg %{buildroot}%{_kf6_datadir}/icons/silver-dark/apps/48/org.fedoraproject.AnacondaInstaller.svg %endif ## trigger-based scriptlets -%transfiletriggerin -n breeze-icon-theme -- %{_datadir}/icons/breeze -gtk-update-icon-cache --force %{_datadir}/icons/breeze &>/dev/null || : +%transfiletriggerin -n breeze-icon-theme -- %{_datadir}/icons/silver +gtk-update-icon-cache --force %{_datadir}/icons/silver &>/dev/null || : -%transfiletriggerin -n breeze-icon-theme -- %{_datadir}/icons/breeze-dark -gtk-update-icon-cache --force %{_datadir}/icons/breeze-dark &>/dev/null || : +%transfiletriggerin -n breeze-icon-theme -- %{_datadir}/icons/silver-dark +gtk-update-icon-cache --force %{_datadir}/icons/silver-dark &>/dev/null || : -%transfiletriggerpostun -n breeze-icon-theme -- %{_datadir}/icons/breeze -gtk-update-icon-cache --force %{_datadir}/icons/breeze &>/dev/null || : +%transfiletriggerpostun -n breeze-icon-theme -- %{_datadir}/icons/silver +gtk-update-icon-cache --force %{_datadir}/icons/silver &>/dev/null || : -%transfiletriggerpostun -n breeze-icon-theme -- %{_datadir}/icons/breeze-dark -gtk-update-icon-cache --force %{_datadir}/icons/breeze-dark &>/dev/null || : +%transfiletriggerpostun -n breeze-icon-theme -- %{_datadir}/icons/silver-dark +gtk-update-icon-cache --force %{_datadir}/icons/silver-dark &>/dev/null || : %endif @@ -186,27 +186,27 @@ gtk-update-icon-cache --force %{_datadir}/icons/breeze-dark &>/dev/null || : %files -n breeze-icon-theme %license COPYING-ICONS %doc README.md -%ghost %{_datadir}/icons/breeze/icon-theme.cache -%{_datadir}/icons/breeze/index.theme -%{_datadir}/icons/breeze/*/ -%ghost %{_datadir}/icons/breeze-dark/icon-theme.cache -%{_datadir}/icons/breeze-dark/index.theme -%{_datadir}/icons/breeze-dark/*/ -%exclude %{_datadir}/icons/breeze/breeze-icons.rcc +%ghost %{_datadir}/icons/silver/icon-theme.cache +%{_datadir}/icons/silver/index.theme +%{_datadir}/icons/silver/*/ +%ghost %{_datadir}/icons/silver-dark/icon-theme.cache +%{_datadir}/icons/silver-dark/index.theme +%{_datadir}/icons/silver-dark/*/ +%exclude %{_datadir}/icons/silver/silver-icons.rcc %if 0%{?fedora} -%exclude %{_datadir}/icons/breeze*/apps/*/org.fedoraproject.AnacondaInstaller.svg +%exclude %{_datadir}/icons/silver*/apps/*/org.fedoraproject.AnacondaInstaller.svg %endif %if 0%{?fedora} %files -n breeze-icon-theme-fedora -%{_datadir}/icons/breeze*/apps/*/org.fedoraproject.AnacondaInstaller.svg +%{_datadir}/icons/silver*/apps/*/org.fedoraproject.AnacondaInstaller.svg %endif %endif %if %{with install_rcc} %files -n breeze-icon-theme-rcc -%{_datadir}/icons/breeze/breeze-icons.rcc +%{_datadir}/icons/silver/silver-icons.rcc %endif %changelog diff --git a/sonic-frameworks-sso/sonic-frameworks-sso.spec b/sonic-frameworks-sso/sonic-frameworks-sso.spec index e4351ff..bfbd67d 100644 --- a/sonic-frameworks-sso/sonic-frameworks-sso.spec +++ b/sonic-frameworks-sso/sonic-frameworks-sso.spec @@ -1,17 +1,15 @@ # Generated for SonicDE from Fedora's signon.spec. # SonicDE is a hard fork of KDE Plasma; the sources come from the # https://github.com/Sonic-DE/sonic-frameworks-sso fork, not from download.kde.org. +# The SonicDE fork has migrated from qmake to CMake and is Qt6-only +# (find_package(Qt6 6.5 ...) in CMakeLists.txt), so this spec uses the +# CMake build system and no longer ships the Qt5 variant. %define _disable_source_fetch 0 %define debug_package %{nil} %global reponame sonic-frameworks-sso # Upstream KDE project: signond %global oldname signon -%global gitdate 20240205 -%global commit0 c8ad98249af541514ff7a81634d3295e712f1a39 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global tag0 VERSION_%{version} - #Name: signon Name: sonic-frameworks-sso Version: 8.61.2 @@ -22,31 +20,13 @@ License: LGPL-2.1-only #URL: https://gitlab.com/accounts-sso/signond URL: https://github.com/Sonic-DE/%{reponame} -# Temporary source, for plasma6 compatibility -#Source0: https://gitlab.com/nicolasfella/signond/-/archive/%%{commit0}/signond-%%{commit0}.tar.gz Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{reponame}-%{version}.tar.gz -# Original Sources -#%%if 0%%{?tag0:1} -#Source0: https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=%%{tag0}#/%%{name}-%%{version}.tar.gz -#%%else -#Source0: https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=%%{commit0}#/%%{name}-%%{shortcommit0}.tar.gz -#%%endif - BuildRequires: make -BuildRequires: dbus-x11 -BuildRequires: doxygen +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: graphviz -BuildRequires: libproxy-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: time BuildRequires: qt6-qtbase-devel -# signon-qt5 was in ktp-5 COPR -Obsoletes: signon-qt5 < 8.57-5 -Provides: signon-qt5 = %{version}-%{release} - # upstream name: signond Provides: signond = %{version}-%{release} @@ -65,14 +45,6 @@ applications. It consists of a secure storage of login credentials (for example usernames and passwords), plugins for different authentication systems and a client library for applications to communicate with this system. -%package qt5 -Summary: Single Sign On client library for Qt5-based applications -Provides: signon-qt5 = %{version}-%{release} -Conflicts: signon-qt5 < %{version}-%{release} - -%description qt5 -%{summary}. - %package qt6 Summary: Single Sign On client library for Qt6-based applications Provides: signon-qt6 = %{version}-%{release} @@ -84,121 +56,57 @@ Conflicts: signon-qt6 < %{version}-%{release} %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-qt6%{?_isa} = %{version}-%{release} # upstream name: signond Provides: signond-devel = %{version}-%{release} Provides: signon-devel = %{version}-%{release} Conflicts: signon-devel < %{version}-%{release} +Provides: signon-qt6-devel = %{version}-%{release} +Conflicts: signon-qt6-devel < %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package qt5-devel -Summary: Development files for %{name}-qt5 -Provides: signon-qt5-devel = %{version}-%{release} -Conflicts: signon-qt5-devel < %{version}-%{release} - -%description qt5-devel -%{summary}. - -%package qt6-devel -Summary: Development files for %{name}-qt6 -Provides: signon-qt6-devel = %{version}-%{release} -Conflicts: signon-qt6-devel < %{version}-%{release} - -%description qt6-devel -%{summary}. - -%package doc -Summary: Documentation for %{name} -BuildArch: noarch - -Provides: signon-doc = %{version}-%{release} -Conflicts: signon-doc < %{version}-%{release} - -%description doc -The %{name}-doc package contains documentation for %{name}. - %prep %autosetup -p1 -n %{reponame}-%{version} +# The fork's CMake tries to install D-Bus interface XML files that are +# not present in the repository. Drop that install rule so the install +# step succeeds; the introspection data is not needed at runtime. +sed -i '/^install(FILES$/,/dbus-1\/interfaces)/d' cmake/signond/CMakeLists.txt %build -mkdir %{oldname}_qt5 -pushd %{oldname}_qt5 -%qmake_qt5 \ - CONFIG+=release \ - QMF_INSTALL_ROOT=%{_prefix} LIBDIR=%{_libdir} ../signon.pro -popd -%make_build -C %{oldname}_qt5 +%cmake -DBUILD_SIGNOND:BOOL=ON -DCMAKE_INSTALL_SYSCONFDIR=/etc +%cmake_build -mkdir %{oldname}_qt6 -pushd %{oldname}_qt6 -%qmake_qt6 \ - CONFIG+=release \ - QMF_INSTALL_ROOT=%{_prefix} LIBDIR=%{_libdir} ../signon.pro -popd -%make_build -C %{oldname}_qt6 %install -make install INSTALL_ROOT=%{buildroot} -C %{oldname}_qt5 -make install INSTALL_ROOT=%{buildroot} -C %{oldname}_qt6 -# Removing additional unneeded files -rm %{buildroot}%{_libdir}/libsignon-qt5.a -rm %{buildroot}%{_libdir}/libsignon-qt6.a +%cmake_install +# create/own libdir/signond/extensions +mkdir -p %{buildroot}%{_libdir}/signond/extensions/ -# create/own libdir/extensions -mkdir -p %{buildroot}%{_libdir}/extensions/ %files -## fixme: common/shared _docdir/signon content below gets in the way -#doc README.md TODO NOTES %license COPYING %config(noreplace) %{_sysconfdir}/signond.conf -%{_bindir}/signond -%{_bindir}/signonpluginprocess -%{_libdir}/libsignon-extension.so.1* -%{_libdir}/libsignon-plugins-common.so.1* -%{_libdir}/libsignon-plugins.so.1* -%{_libdir}/signon/ +%{_libexecdir}/signond +%{_libdir}/libsignon-extension.so.0* +%{_libdir}/libsignon-plugins-common.so.0* +%{_libdir}/signond/ %{_datadir}/dbus-1/services/*.service -%files qt5 -%{_libdir}/libsignon-qt5.so.1{,.*} - %files qt6 -%{_libdir}/libsignon-qt6.so.1{,.*} +%{_libdir}/libsignon-qt6.so.0{,.*} %files devel -%{_includedir}/signon-extension/ -%{_includedir}/signon-plugins/ -%{_includedir}/signond/ -%{_libdir}/libsignon-extension.so -%{_libdir}/libsignon-plugins-common.so -%{_libdir}/libsignon-plugins.so -%{_libdir}/pkgconfig/SignOnExtension.pc -%{_libdir}/pkgconfig/signon-plugins-common.pc -%{_libdir}/pkgconfig/signon-plugins.pc -%{_libdir}/pkgconfig/signond.pc - -%files qt5-devel -%{_includedir}/signon-qt5/ -%{_libdir}/cmake/SignOnQt5/ -%{_libdir}/pkgconfig/libsignon-qt5.pc -%{_libdir}/libsignon-qt5.so - -%files qt6-devel %{_includedir}/signon-qt6/ %{_libdir}/cmake/SignOnQt6/ %{_libdir}/pkgconfig/libsignon-qt6.pc %{_libdir}/libsignon-qt6.so - -%files doc -%{_docdir}/signon/ -%{_docdir}/libsignon-qt/ -%{_docdir}/signon-plugins/ -%{_docdir}/signon-plugins-dev/ +%{_libdir}/libsignon-extension.so +%{_libdir}/libsignon-plugins-common.so %changelog * Mon Aug 24 2026 Anders da Silva Rytter Hansen - 8.61.2-1 diff --git a/sonic-frameworks-text-editor/sonic-frameworks-text-editor.spec b/sonic-frameworks-text-editor/sonic-frameworks-text-editor.spec index 5781575..b335363 100644 --- a/sonic-frameworks-text-editor/sonic-frameworks-text-editor.spec +++ b/sonic-frameworks-text-editor/sonic-frameworks-text-editor.spec @@ -106,7 +106,7 @@ mkdir -p %{buildroot}%{_kf6_qtplugindir}/ktexteditor # Removing empty file rm -f %{buildroot}%{_kf6_datadir}/katepart5/script/README.md -%files -f %{name}.lang +%files -f %{oldname}.lang %dir %{_kf6_plugindir}/parts/ %doc README.md %license LICENSES/*.txt diff --git a/sonic-frameworks-text-widgets/sonic-frameworks-text-widgets.spec b/sonic-frameworks-text-widgets/sonic-frameworks-text-widgets.spec index 249fcd9..e8100de 100644 --- a/sonic-frameworks-text-widgets/sonic-frameworks-text-widgets.spec +++ b/sonic-frameworks-text-widgets/sonic-frameworks-text-widgets.spec @@ -94,7 +94,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_libdir}/libKF6TextWidgets.so.* diff --git a/sonic-frameworks-ui-components/sonic-frameworks-ui-components.spec b/sonic-frameworks-ui-components/sonic-frameworks-ui-components.spec index 66759b4..2f3de3e 100644 --- a/sonic-frameworks-ui-components/sonic-frameworks-ui-components.spec +++ b/sonic-frameworks-ui-components/sonic-frameworks-ui-components.spec @@ -95,7 +95,7 @@ Developer Documentation files for %{name} in HTML format # create/own parts plugin dir mkdir -p %{buildroot}%{_kf6_plugindir}/parts/ -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md AUTHORS %license LICENSES/*.txt %{_kf6_libdir}/libKF6Parts.so.* diff --git a/sonic-frameworks-unit-conversion/sonic-frameworks-unit-conversion.spec b/sonic-frameworks-unit-conversion/sonic-frameworks-unit-conversion.spec index a1f4db9..db5d2aa 100644 --- a/sonic-frameworks-unit-conversion/sonic-frameworks-unit-conversion.spec +++ b/sonic-frameworks-unit-conversion/sonic-frameworks-unit-conversion.spec @@ -96,7 +96,7 @@ Developer Documentation files for %{name} in HTML format %find_lang %{oldname} --all-name --with-man -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_libdir}/libKF6UnitConversion.so.* diff --git a/sonic-frameworks-xml-gui/sonic-frameworks-xml-gui.spec b/sonic-frameworks-xml-gui/sonic-frameworks-xml-gui.spec index 66cb5af..b71f357 100644 --- a/sonic-frameworks-xml-gui/sonic-frameworks-xml-gui.spec +++ b/sonic-frameworks-xml-gui/sonic-frameworks-xml-gui.spec @@ -114,7 +114,7 @@ Developer Documentation files for %{name} in HTML format mkdir -p %{buildroot}%{_kf6_datadir}/kxmlgui5/ %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/*.txt %{_kf6_datadir}/qlogging-categories6/%{framework}.* diff --git a/sonic-gtk-theme-bridge/sonic-gtk-theme-bridge.spec b/sonic-gtk-theme-bridge/sonic-gtk-theme-bridge.spec index ae9b0e8..de5fcfa 100644 --- a/sonic-gtk-theme-bridge/sonic-gtk-theme-bridge.spec +++ b/sonic-gtk-theme-bridge/sonic-gtk-theme-bridge.spec @@ -88,7 +88,7 @@ appearance of GTK apps in KDE. %{_kf6_plugindir}/kded/gtkconfig.so %{_libdir}/gtk-3.0/modules/libcolorreload-gtk-module.so %{_libdir}/gtk-3.0/modules/libwindow-decorations-gtk-module.so -%{_datadir}/themes/Breeze/window_decorations.css +%{_datadir}/themes/Silver/window_decorations.css %{_datadir}/kcm-gtk-module/ %{_datadir}/qlogging-categories6/kde-gtk-config.categories diff --git a/sonic-pipewire/sonic-pipewire.spec b/sonic-pipewire/sonic-pipewire.spec index c314e96..81f4674 100644 --- a/sonic-pipewire/sonic-pipewire.spec +++ b/sonic-pipewire/sonic-pipewire.spec @@ -19,7 +19,7 @@ URL: https://github.com/Sonic-DE/%{reponame} #Source0: https://download.kde.org/%%{stable_kf6}/plasma/%%{version}/%%{name}-%%{version}.tar.xz Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{reponame}-%{version}.tar.gz #Source1: https://download.kde.org/%%{stable_kf6}/plasma/%%{version}/%%{name}-%%{version}.tar.xz.sig -Patch0: %{name}-ffmpeg8.patch +# ffmpeg8 compat patch not needed; the fork works with ffmpeg 7.x in EPEL10 # Compile Tools BuildRequires: cmake @@ -101,7 +101,7 @@ developing applications that use %{name}. %find_lang %{oldname} --with-qt --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/* %{_libdir}/libKPipeWire.so.6 %{_libdir}/libKPipeWire.so.%{version} diff --git a/sonic-polkit/sonic-polkit.spec b/sonic-polkit/sonic-polkit.spec index facb0ca..bf338ae 100644 --- a/sonic-polkit/sonic-polkit.spec +++ b/sonic-polkit/sonic-polkit.spec @@ -1,6 +1,9 @@ # Generated for SonicDE from Fedora's polkit-qt-1.spec. # SonicDE is a hard fork of KDE Plasma; the sources come from the # https://github.com/Sonic-DE/sonic-polkit fork, not from download.kde.org. +# The SonicDE fork is Qt6-only (the upstream CMakeLists hardcodes +# QT_MAJOR_VERSION=6 and requires Qt >= 6.5.0), so this spec no longer +# builds the Qt5 variant that Fedora's polkit-qt-1 shipped. %define _disable_source_fetch 0 %define debug_package %{nil} %global reponame sonic-polkit @@ -32,37 +35,21 @@ Conflicts: polkit-qt-1 < %{version}-%{release} Polkit-qt is a library that lets developers use the PolicyKit API through a nice Qt-styled API. -%package -n polkit-qt5-1 -Summary: PolicyKit Qt5 bindings -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Widgets) -Obsoletes: polkit-qt5 < 0.112.0-3 -Provides: polkit-qt5 = %{version}-%{release} -%description -n polkit-qt5-1 -Polkit-qt is a library that lets developers use the PolicyKit API -through a nice Qt-styled API. - -%package -n polkit-qt5-1-devel -Summary: Development files for PolicyKit Qt5 bindings -Obsoletes: polkit-qt5-devel < 0.112.0-3 -Provides: polkit-qt5-devel = %{version}-%{release} -Requires: polkit-qt5-1%{?_isa} = %{version}-%{release} -%description -n polkit-qt5-1-devel -%{summary}. - %package -n polkit-qt6-1 Summary: PolicyKit Qt6 bindings +BuildRequires: pkgconfig(Qt6Core) BuildRequires: pkgconfig(Qt6DBus) BuildRequires: pkgconfig(Qt6Gui) BuildRequires: pkgconfig(Qt6Widgets) +Provides: polkit-qt6-1 = %{version}-%{release} %description -n polkit-qt6-1 Polkit-qt is a library that lets developers use the PolicyKit API through a nice Qt-styled API. %package -n polkit-qt6-1-devel -Summary: Development files for PolicyKit Qt5 bindings +Summary: Development files for PolicyKit Qt6 bindings Requires: polkit-qt6-1%{?_isa} = %{version}-%{release} +Provides: polkit-qt6-1-devel = %{version}-%{release} %description -n polkit-qt6-1-devel %{summary}. @@ -71,39 +58,12 @@ Requires: polkit-qt6-1%{?_isa} = %{version}-%{release} %build -%global _vpath_builddir %{_target_platform}-qt5 -%cmake -DBUILD_EXAMPLES:BOOL=OFF -DQT_MAJOR_VERSION=5 -%cmake_build - -%global _vpath_builddir %{_target_platform}-qt6 -%cmake -DBUILD_EXAMPLES:BOOL=OFF -DQT_MAJOR_VERSION=6 +%cmake -DBUILD_EXAMPLES:BOOL=OFF %cmake_build %install -%global _vpath_builddir %{_target_platform}-qt5 %cmake_install -%global _vpath_builddir %{_target_platform}-qt6 -%cmake_install - -%files -n polkit-qt5-1 -%doc AUTHORS README -%license LICENSES/* -%{_libdir}/libpolkit-qt5-core-1.so.1* -%{_libdir}/libpolkit-qt5-gui-1.so.1* -%{_libdir}/libpolkit-qt5-agent-1.so.1* - -%files -n polkit-qt5-1-devel -%{_includedir}/polkit-qt5-1/ -%{_libdir}/libpolkit-qt5-core-1.so -%{_libdir}/libpolkit-qt5-gui-1.so -%{_libdir}/libpolkit-qt5-agent-1.so -%{_libdir}/pkgconfig/polkit-qt5-1.pc -%{_libdir}/pkgconfig/polkit-qt5-core-1.pc -%{_libdir}/pkgconfig/polkit-qt5-gui-1.pc -%{_libdir}/pkgconfig/polkit-qt5-agent-1.pc -%{_libdir}/cmake/PolkitQt5-1/ - %files -n polkit-qt6-1 %doc AUTHORS README %license LICENSES/* diff --git a/sonic-pulseaudio-library/sonic-pulseaudio-library.spec b/sonic-pulseaudio-library/sonic-pulseaudio-library.spec index c9b80a9..cfa119e 100644 --- a/sonic-pulseaudio-library/sonic-pulseaudio-library.spec +++ b/sonic-pulseaudio-library/sonic-pulseaudio-library.spec @@ -21,7 +21,6 @@ Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{reponame}-%{versio BuildRequires: sonic-frameworks-cmake-modules BuildRequires: sonic-rpm-macros -BuildRequires: kf5-rpm-macros BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(glib-2.0) BuildRequires: cmake(Qt6Gui) diff --git a/sonic-qt-theme-bridge/sonic-qt-theme-bridge.spec b/sonic-qt-theme-bridge/sonic-qt-theme-bridge.spec index b11d981..512472e 100644 --- a/sonic-qt-theme-bridge/sonic-qt-theme-bridge.spec +++ b/sonic-qt-theme-bridge/sonic-qt-theme-bridge.spec @@ -7,12 +7,8 @@ # Upstream KDE project: plasma-integration %global oldname plasma-integration -# EPEL10 does not have kf5 -%if 0%{?rhel} && 0%{?rhel} >= 10 +# SonicDE is a Qt6/KF6-only hard fork; no KF5 packages are shipped. %bcond_with kf5 -%else -%bcond_without kf5 -%endif #Name: plasma-integration Name: sonic-qt-theme-bridge diff --git a/sonic-quick-image-editor/sonic-quick-image-editor.spec b/sonic-quick-image-editor/sonic-quick-image-editor.spec index 9006382..2e214e2 100644 --- a/sonic-quick-image-editor/sonic-quick-image-editor.spec +++ b/sonic-quick-image-editor/sonic-quick-image-editor.spec @@ -67,14 +67,13 @@ applications that use %{name}-qt6. %files qt6 %{_kf6_qmldir}/org/kde/kquickimageeditor -%{_kf6_libdir}/libKQuickImageEditor.so.%{version} +%{_kf6_libdir}/libKQuickImageEditor.so.0.* %{_kf6_libdir}/libKQuickImageEditor.so.1 %files qt6-devel %{_kf6_libdir}/libKQuickImageEditor.so %{_kf6_libdir}/cmake/KQuickImageEditor %{_includedir}/KQuickImageEditor/ -%{_includedir}/kquickimageeditor/ %{_kf6_archdatadir}/mkspecs/modules/qt_KQuickImageEditor.pri %changelog diff --git a/sonic-rdp-server/sonic-rdp-server.spec b/sonic-rdp-server/sonic-rdp-server.spec index 826b7a0..4af1309 100644 --- a/sonic-rdp-server/sonic-rdp-server.spec +++ b/sonic-rdp-server/sonic-rdp-server.spec @@ -125,7 +125,7 @@ Conflicts: krdp-devel < %{version}-%{release} %systemd_user_postun_with_reload app-org.kde.krdpserver.service %systemd_user_postun app-org.kde.krdpserver.service -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %{_kf6_bindir}/krdpserver %{_kf6_datadir}/applications/kcm_krdpserver.desktop diff --git a/sonic-screenies/sonic-screenies.spec b/sonic-screenies/sonic-screenies.spec index 324b30d..c07e92c 100644 --- a/sonic-screenies/sonic-screenies.spec +++ b/sonic-screenies/sonic-screenies.spec @@ -134,7 +134,7 @@ Conflicts: spectacle < %{version}-%{release} appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.spectacle.appdata.xml ||: desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.spectacle.desktop -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/* %{_kf6_bindir}/spectacle %{_kf6_datadir}/man/man1/spectacle.1* diff --git a/sonic-system-log/sonic-system-log.spec b/sonic-system-log/sonic-system-log.spec index 3cebcca..3269ea4 100644 --- a/sonic-system-log/sonic-system-log.spec +++ b/sonic-system-log/sonic-system-log.spec @@ -91,7 +91,7 @@ desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{oldname appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.ksystemlog.appdata.xml -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES %{_kf6_bindir}/ksystemlog %{_kf6_datadir}/applications/org.kde.ksystemlog.desktop diff --git a/sonic-system-monitor/sonic-system-monitor.spec b/sonic-system-monitor/sonic-system-monitor.spec index fc85e3a..17297d9 100644 --- a/sonic-system-monitor/sonic-system-monitor.spec +++ b/sonic-system-monitor/sonic-system-monitor.spec @@ -80,7 +80,7 @@ resources. %cmake_install %find_lang %{oldname} --all-name --with-html -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/*.txt %{_bindir}/plasma-systemmonitor %{_datadir}/applications/org.kde.plasma-systemmonitor.desktop diff --git a/sonic-thunderbolt/sonic-thunderbolt.spec b/sonic-thunderbolt/sonic-thunderbolt.spec index f2de9af..7c12840 100644 --- a/sonic-thunderbolt/sonic-thunderbolt.spec +++ b/sonic-thunderbolt/sonic-thunderbolt.spec @@ -70,7 +70,7 @@ kernel. %check desktop-file-validate %{buildroot}/%{_datadir}/applications/kcm_bolt.desktop -%files -f %{name}.lang +%files -f %{oldname}.lang %doc README.md %license LICENSES/* %{_kf6_libdir}/libkbolt.so diff --git a/sonic-vault/sonic-vault.spec b/sonic-vault/sonic-vault.spec index c5a0bbb..bbe9803 100644 --- a/sonic-vault/sonic-vault.spec +++ b/sonic-vault/sonic-vault.spec @@ -73,7 +73,7 @@ prying eyes even when the user is logged in. %cmake_install %find_lang %{oldname} --all-name -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/* %{_kf6_plugindir}/kded/plasmavault.so %dir %{_qt6_plugindir}/plasma/applets/ diff --git a/sonic-welcome-center/sonic-welcome-center.spec b/sonic-welcome-center/sonic-welcome-center.spec index 1bb0950..7e66e8b 100644 --- a/sonic-welcome-center/sonic-welcome-center.spec +++ b/sonic-welcome-center/sonic-welcome-center.spec @@ -82,7 +82,7 @@ rm -fv %{buildroot}%{_kf6_libdir}/libplasma-welcome-publicplugin.a #appstream-util validate-relax --nonet %%{buildroot}%%{_kf6_metainfodir}/%%{orgname}.*.xml desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/%{orgname}.desktop -%files -f %{name}.lang +%files -f %{oldname}.lang %license LICENSES/{BSD-3-Clause.txt,GPL-2.0-or-later.txt,FSFAP.txt} %doc README.md %{_kf6_bindir}/plasma-welcome diff --git a/sonic-win/sonic-win.spec b/sonic-win/sonic-win.spec index 6629b39..64ea0da 100644 --- a/sonic-win/sonic-win.spec +++ b/sonic-win/sonic-win.spec @@ -233,7 +233,7 @@ Conflicts: kwin-x11-doc %install %cmake_install -%find_lang %{name} --with-html --all-name +%find_lang kwin6 --with-html --all-name grep "%{_kf6_docdir}" %{name}.lang > %{name}-doc.lang cat %{name}.lang %{name}-doc.lang | sort | uniq -u > kwin6.lang @@ -292,7 +292,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/xdg/Xwayland-session.d %{_includedir}/kwin-x11 %{_libdir}/libkwin-x11.so -%files doc -f %{name}-doc.lang +%files doc -f kwin6-doc.lang %license LICENSES/*.txt diff --git a/sonic-workspace-wallpapers/sonic-workspace-wallpapers.spec b/sonic-workspace-wallpapers/sonic-workspace-wallpapers.spec index c26f4ed..98c6f25 100644 --- a/sonic-workspace-wallpapers/sonic-workspace-wallpapers.spec +++ b/sonic-workspace-wallpapers/sonic-workspace-wallpapers.spec @@ -61,43 +61,7 @@ Conflicts: plasma-workspace-wallpapers < %{version}-%{release} %files %license COPYING.LGPL3 -%{_datadir}/wallpapers/Altai/ -%{_datadir}/wallpapers/Autumn/ -%{_datadir}/wallpapers/BytheWater/ -%{_datadir}/wallpapers/Canopee/ -%{_datadir}/wallpapers/Cascade/ -%{_datadir}/wallpapers/Cluster/ -%{_datadir}/wallpapers/ColdRipple/ -%{_datadir}/wallpapers/ColorfulCups/ -%{_datadir}/wallpapers/DarkestHour/ -%{_datadir}/wallpapers/Elarun/ -%{_datadir}/wallpapers/EveningGlow/ -%{_datadir}/wallpapers/FallenLeaf/ -%{_datadir}/wallpapers/FlyingKonqui/ -%{_datadir}/wallpapers/Flow/ -%{_datadir}/wallpapers/Grey/ -%{_datadir}/wallpapers/Honeywave/ -%{_datadir}/wallpapers/IceCold/ -%{_datadir}/wallpapers/Kay/ -%{_datadir}/wallpapers/Kite/ -%{_datadir}/wallpapers/Kokkini/ -%{_datadir}/wallpapers/MilkyWay/ -%{_datadir}/wallpapers/Mountain/ -%{_datadir}/wallpapers/Nexus/ -%{_datadir}/wallpapers/Nuvole/ -%{_datadir}/wallpapers/OneStandsOut/ -%{_datadir}/wallpapers/Opal/ -%{_datadir}/wallpapers/PastelHills/ -%{_datadir}/wallpapers/Patak/ -%{_datadir}/wallpapers/Path/ -%{_datadir}/wallpapers/SafeLanding/ -%{_datadir}/wallpapers/ScarletTree/ -%{_datadir}/wallpapers/Shell/ -%{_datadir}/wallpapers/summer_1am/ -%{_datadir}/wallpapers/Volna/ -%{_datadir}/wallpapers/Coast/ -%{_datadir}/wallpapers/Orionids/ -%{_datadir}/wallpapers/Sub-Arctic/ +%{_datadir}/wallpapers/*/ %changelog * Mon Aug 24 2026 Anders da Silva Rytter Hansen - 6.7.4.1-1 diff --git a/sonic-workspace/sonic-workspace.spec b/sonic-workspace/sonic-workspace.spec index 2bb3fb6..280a128 100644 --- a/sonic-workspace/sonic-workspace.spec +++ b/sonic-workspace/sonic-workspace.spec @@ -503,7 +503,7 @@ fi %files common %license LICENSES -%files -f %{name}.lang +%files -f all.lang %{_libexecdir}/ksecretprompter %{_kf6_datadir}/applications/org.kde.baloorunner.desktop %{_kf6_datadir}/applications/org.kde.secretprompter.desktop