From 454a7c61a76364d7ff365075e84d4d6acb00dc8c07cded652f54a3c06d3440fd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 15 May 2021 16:17:00 +0000 Subject: [PATCH 1/2] Plasma 5.22 Beta, tested a bit more. Now with cmake >= 3.16 and duplicates in .changes removed (now using git log a..b instead of a...b) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivitymanagerd?expand=0&rev=136 --- kactivitymanagerd-5.21.5.tar.xz | 3 --- kactivitymanagerd-5.21.5.tar.xz.sig | 11 ----------- kactivitymanagerd-5.21.90.tar.xz | 3 +++ kactivitymanagerd-5.21.90.tar.xz.sig | 11 +++++++++++ kactivitymanagerd.changes | 19 +++++++++++++++++++ kactivitymanagerd.spec | 11 +++++++---- 6 files changed, 40 insertions(+), 18 deletions(-) delete mode 100644 kactivitymanagerd-5.21.5.tar.xz delete mode 100644 kactivitymanagerd-5.21.5.tar.xz.sig create mode 100644 kactivitymanagerd-5.21.90.tar.xz create mode 100644 kactivitymanagerd-5.21.90.tar.xz.sig diff --git a/kactivitymanagerd-5.21.5.tar.xz b/kactivitymanagerd-5.21.5.tar.xz deleted file mode 100644 index cae936d..0000000 --- a/kactivitymanagerd-5.21.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77b5394cae27d68c55eaa02e7b9be524b6d8fee9a088e505830347b8289ef0c8 -size 99760 diff --git a/kactivitymanagerd-5.21.5.tar.xz.sig b/kactivitymanagerd-5.21.5.tar.xz.sig deleted file mode 100644 index 8cf9f5b..0000000 --- a/kactivitymanagerd-5.21.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAmCRNZgACgkQEZaMRJKM -rvzJeggAnM8m4W3kYTPE2E1LRrPKbvdknN+Tbp3uw6u6bs0xmJal2uaDVz987VhO -sWCHGu8wkHhfEVHtI6oz/IbdCLklB8Ihn70qYbYoLrrtm1PUsZgfJSGbFSrVAmTf -8XtN8TwTprlRFOi3mDFCmpMU8Mg/2dbaY6YNvkRaPxo2daD4W9shpvLfiKWXzxzH -wPL4C1uikGXyMU5JGaq+QxgG0RziEIKzyoXbLb0Ko0S9FHQFNh5WxKF5MyZ+0ORX -wKtIIBdVhAtbMM4Ee9yB0eIKuX882+dHbrZdT+lCDoClxa8tEomi3VFyAzKva1n3 -dwRIXqgRMmrGsE1iLH6W6L02kbaNsw== -=ECox ------END PGP SIGNATURE----- diff --git a/kactivitymanagerd-5.21.90.tar.xz b/kactivitymanagerd-5.21.90.tar.xz new file mode 100644 index 0000000..1169194 --- /dev/null +++ b/kactivitymanagerd-5.21.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d71a216fd35fea08cdc53e383443a96662fb99141bcc96931e0900df3285568b +size 102956 diff --git a/kactivitymanagerd-5.21.90.tar.xz.sig b/kactivitymanagerd-5.21.90.tar.xz.sig new file mode 100644 index 0000000..67a4128 --- /dev/null +++ b/kactivitymanagerd-5.21.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdJA8ACgkQ7JTRj38F +mX7lAwf/YFpEjiKFV7MMXR7np7BQAGi4DlpBsydH2cEwJwpIyCOU71SCPMSsi7G5 +uHpEfV5mKO2SPjGiBgOBFn2R2kFWud0i4Yu1w0tJ/X/XHtxWvJpekaxpWYXoMznV +F6wnMreylPbPbY+FXCjQ6kpjwoHkiaknWgyqbXW6BaTAhkQBNiqKONce+Lhdiy7o +DW1jBlSO/TPl8Uc9fXHmCdfCxPDoJGKLmqJhWEEjapWdhabWbcnoAQDIHvTh+Qi8 +FDBf3FHoWdz0XTmGslMZjDZEL/0iu+qnAcV7/tbLsKgVMx/uqK2ZG7pWauHtxTda +z8cPryANioLMlb6GJ3KtwEa8+Ms3/w== +=/8MD +-----END PGP SIGNATURE----- diff --git a/kactivitymanagerd.changes b/kactivitymanagerd.changes index 425d346..45e481a 100644 --- a/kactivitymanagerd.changes +++ b/kactivitymanagerd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu May 13 18:15:30 UTC 2021 - Fabian Vogt + +- Update to 5.21.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.21.90 +- Changes since 5.21.5: + * sqlite: Include sqlite error as crash error message + * Add .git-blame-ignore-revs file + * Add pre-commit hook for clang-format + * Run clang-format + * Fix license header + * Raise minimum CMake version to 3.16 + * Remove macro string magic + * Implement Activities Runner as DBus Runner + * Use versionless Qt cmake target + * Autogenerate files + ------------------------------------------------------------------- Tue May 4 14:15:39 UTC 2021 - Fabian Vogt diff --git a/kactivitymanagerd.spec b/kactivitymanagerd.spec index ffbdc84..f9c3ced 100644 --- a/kactivitymanagerd.spec +++ b/kactivitymanagerd.spec @@ -20,15 +20,15 @@ %bcond_without lang Name: kactivitymanagerd -Version: 5.21.5 +Version: 5.21.90 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0-or-later Group: System/GUI/KDE Url: http://projects.kde.org/kactivitymanagerd -Source: https://download.kde.org/stable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz +Source: https://download.kde.org/unstable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz.sig Source2: plasma.keyring %endif %if 0%{?suse_version} > 1325 @@ -36,7 +36,7 @@ BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel >= 1.49.0 %endif -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 3.16 BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: fdupes BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version} @@ -120,6 +120,9 @@ Provides translations to the package %{name}. %{_kf5_plugindir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ +%dir %{_kf5_sharedir}/krunner/ +%dir %{_kf5_sharedir}/krunner/dbusplugins/ +%{_kf5_sharedir}/krunner/dbusplugins/plasma-runnners-activities.desktop %{_kf5_sharedir}/dbus-1/services/org.kde.ActivityManager.service %{_kf5_debugdir}/kactivitymanagerd.categories %{_userunitdir}/plasma-kactivitymanagerd.service From 618a24677230e2cab5eea8e9cf286c3151cfc151a2890a4e4a076a6324bf1856 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 4 Jun 2021 12:42:06 +0000 Subject: [PATCH 2/2] Plasma 5.22.0, disable publishing before accepting. ksystemstats5 link fixed, cherry-picked revert removed from .changes OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivitymanagerd?expand=0&rev=137 --- kactivitymanagerd-5.21.90.tar.xz | 3 --- kactivitymanagerd-5.21.90.tar.xz.sig | 11 ----------- kactivitymanagerd-5.22.0.tar.xz | 3 +++ kactivitymanagerd-5.22.0.tar.xz.sig | 11 +++++++++++ kactivitymanagerd.changes | 9 +++++++++ kactivitymanagerd.spec | 6 +++--- 6 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 kactivitymanagerd-5.21.90.tar.xz delete mode 100644 kactivitymanagerd-5.21.90.tar.xz.sig create mode 100644 kactivitymanagerd-5.22.0.tar.xz create mode 100644 kactivitymanagerd-5.22.0.tar.xz.sig diff --git a/kactivitymanagerd-5.21.90.tar.xz b/kactivitymanagerd-5.21.90.tar.xz deleted file mode 100644 index 1169194..0000000 --- a/kactivitymanagerd-5.21.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d71a216fd35fea08cdc53e383443a96662fb99141bcc96931e0900df3285568b -size 102956 diff --git a/kactivitymanagerd-5.21.90.tar.xz.sig b/kactivitymanagerd-5.21.90.tar.xz.sig deleted file mode 100644 index 67a4128..0000000 --- a/kactivitymanagerd-5.21.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdJA8ACgkQ7JTRj38F -mX7lAwf/YFpEjiKFV7MMXR7np7BQAGi4DlpBsydH2cEwJwpIyCOU71SCPMSsi7G5 -uHpEfV5mKO2SPjGiBgOBFn2R2kFWud0i4Yu1w0tJ/X/XHtxWvJpekaxpWYXoMznV -F6wnMreylPbPbY+FXCjQ6kpjwoHkiaknWgyqbXW6BaTAhkQBNiqKONce+Lhdiy7o -DW1jBlSO/TPl8Uc9fXHmCdfCxPDoJGKLmqJhWEEjapWdhabWbcnoAQDIHvTh+Qi8 -FDBf3FHoWdz0XTmGslMZjDZEL/0iu+qnAcV7/tbLsKgVMx/uqK2ZG7pWauHtxTda -z8cPryANioLMlb6GJ3KtwEa8+Ms3/w== -=/8MD ------END PGP SIGNATURE----- diff --git a/kactivitymanagerd-5.22.0.tar.xz b/kactivitymanagerd-5.22.0.tar.xz new file mode 100644 index 0000000..102ca4b --- /dev/null +++ b/kactivitymanagerd-5.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8882b792086e94b7e1a1130417bdf4c0e08a7af84119812997318c62dfc2950 +size 102960 diff --git a/kactivitymanagerd-5.22.0.tar.xz.sig b/kactivitymanagerd-5.22.0.tar.xz.sig new file mode 100644 index 0000000..13b2cc8 --- /dev/null +++ b/kactivitymanagerd-5.22.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC44EcACgkQ7JTRj38F +mX7rpgf/RxTwI3bGi3ZNdfB96pIJ9CZmlS9qHLLu0jfq2jU19eiQuJDc2XD6ypZ2 +LLs8dcFXuOcR1W9bFgV1BasjVFxqZD+LAein548epNqOmnBYLqIRvqSmFF47ozWN +vwWHHvATdFhp03d0p09/+qyCAYAYEbZiHtfhPieM5XXwcr6e2BXctbehety6Cc0j +sSHHbeCyTpETm7tPlcRnXsZTILRGobwNcAlGOXxkKXR6DtAVBrOq3YDRW50LVs3V +QWtG/X2rSwQ42gsRbg4sqN+Wua46sK8QawHCusqL7FOmyzcjFggFdfiaK09MgJkd +qsjMUCaYuSiO0Yh7RONmMt4UZllltg== +=ytdC +-----END PGP SIGNATURE----- diff --git a/kactivitymanagerd.changes b/kactivitymanagerd.changes index 45e481a..0eedfc7 100644 --- a/kactivitymanagerd.changes +++ b/kactivitymanagerd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 3 13:06:12 UTC 2021 - Fabian Vogt + +- Update to 5.22.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.22.0 +- No code changes since 5.21.90 + ------------------------------------------------------------------- Thu May 13 18:15:30 UTC 2021 - Fabian Vogt diff --git a/kactivitymanagerd.spec b/kactivitymanagerd.spec index f9c3ced..5d2f0ad 100644 --- a/kactivitymanagerd.spec +++ b/kactivitymanagerd.spec @@ -20,15 +20,15 @@ %bcond_without lang Name: kactivitymanagerd -Version: 5.21.90 +Version: 5.22.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0-or-later Group: System/GUI/KDE Url: http://projects.kde.org/kactivitymanagerd -Source: https://download.kde.org/unstable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz +Source: kactivitymanagerd-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz.sig +Source1: kactivitymanagerd-%{version}.tar.xz.sig Source2: plasma.keyring %endif %if 0%{?suse_version} > 1325