From 03ff573977338407746b16277e721bda4c74c8f5d930c0508f248a7a83042be1 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 5 Mar 2024 12:37:57 +0000 Subject: [PATCH] More obsoletions + kirigami-addons 1.0.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-sdk?expand=0&rev=4 --- plasma6-sdk.changes | 5 +++++ plasma6-sdk.spec | 29 ++++++++++------------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/plasma6-sdk.changes b/plasma6-sdk.changes index 9873aa8..fe4d232 100644 --- a/plasma6-sdk.changes +++ b/plasma6-sdk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 5 08:27:01 UTC 2024 - Fabian Vogt + +- Merge plasmaengineexplorer6 into plasma6-sdk + ------------------------------------------------------------------- Mon Mar 4 18:52:23 UTC 2024 - Christophe Marin diff --git a/plasma6-sdk.spec b/plasma6-sdk.spec index 57625d1..bf4dba8 100644 --- a/plasma6-sdk.spec +++ b/plasma6-sdk.spec @@ -67,24 +67,18 @@ BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} BuildRequires: cmake(Qt6Xml) >= %{qt6_version} Requires: bash Requires: kf6-kirigami-imports >= %{kf6_version} -Requires: plasmaengineexplorer6 +Provides: plasmaengineexplorer5 = %{version} +Obsoletes: plasmaengineexplorer5 < %{version} +Provides: plasmaengineexplorer6 = %{version} +Obsoletes: plasmaengineexplorer6 < %{version} +Provides: plasma5-sdk = %{version} +Obsoletes: plasma5-sdk-lang < %{version} Conflicts: plasmate %description Plasma SDK taylored for development of Plasma components, such as Widgets, Runners, Dataengines. -%package -n plasmaengineexplorer6 -Summary: Provides direct access to plasma data engines -License: GPL-2.0-only -Conflicts: plasmate -Provides: plasmaengineexplorer5 = %{version} -Obsoletes: plasmaengineexplorer5 < %{version} - -%description -n plasmaengineexplorer6 -Plasmaengineexplorer is a graphical tool allowing developers to -test Plasma data engines without writing a Plasma applet. - %lang_package %prep @@ -108,17 +102,20 @@ cp -L %{_kf6_iconsdir}/breeze/actions/22/tools-wizard.svg %{buildroot}%{_kf6_ico %files %license LICENSES/* %{_kf6_bindir}/iconexplorer +%{_kf6_bindir}/plasmaengineexplorer %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_kqml %{_datadir}/zsh/site-functions/_plasmoidviewer %{_kf6_applicationsdir}/org.kde.iconexplorer.desktop %{_kf6_applicationsdir}/org.kde.plasma.themeexplorer.desktop +%{_kf6_applicationsdir}/org.kde.plasmaengineexplorer.desktop %{_kf6_applicationsdir}/org.kde.plasmoidviewer.desktop %{_kf6_appstreamdir}/org.kde.plasma.iconexplorer.appdata.xml %{_kf6_appstreamdir}/org.kde.plasma.lookandfeelexplorer.appdata.xml %{_kf6_appstreamdir}/org.kde.plasma.plasmoidviewershell.appdata.xml %{_kf6_appstreamdir}/org.kde.plasma.themeexplorer.appdata.xml +%{_kf6_appstreamdir}/org.kde.plasmaengineexplorer.appdata.xml %{_kf6_appstreamdir}/org.kde.plasmoidviewer.appdata.xml %{_kf6_bindir}/kqml %{_kf6_bindir}/lookandfeelexplorer @@ -134,14 +131,8 @@ cp -L %{_kf6_iconsdir}/breeze/actions/22/tools-wizard.svg %{buildroot}%{_kf6_ico %{_kf6_sharedir}/kpackage/genericqml/org.kde.plasma.lookandfeelexplorer/ %{_kf6_sharedir}/kpackage/genericqml/org.kde.plasma.themeexplorer/ %{_mandir}/man1/kqml.1%{?ext_man} -%{_mandir}/man1/plasmoidviewer.1%{?ext_man} - -%files -n plasmaengineexplorer6 -%license LICENSES/* -%{_kf6_bindir}/plasmaengineexplorer %{_mandir}/man1/plasmaengineexplorer.1%{?ext_man} -%{_kf6_applicationsdir}/org.kde.plasmaengineexplorer.desktop -%{_kf6_appstreamdir}/org.kde.plasmaengineexplorer.appdata.xml +%{_mandir}/man1/plasmoidviewer.1%{?ext_man} %files lang -f %{name}.lang