From 64d0527df520e1ee092ca059e12602696498f71861300e08ab28d821d25516ef Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 20 Sep 2019 11:01:11 +0000 Subject: [PATCH] Plasma 5.17 Beta, fourth try OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=194 --- discover-5.16.5.tar.xz | 3 -- discover-5.16.5.tar.xz.sig | 11 ------ discover-5.16.90.tar.xz | 3 ++ discover-5.16.90.tar.xz.sig | 11 ++++++ discover.changes | 11 ++++++ discover.spec | 71 ++++++++++++------------------------- 6 files changed, 47 insertions(+), 63 deletions(-) delete mode 100644 discover-5.16.5.tar.xz delete mode 100644 discover-5.16.5.tar.xz.sig create mode 100644 discover-5.16.90.tar.xz create mode 100644 discover-5.16.90.tar.xz.sig diff --git a/discover-5.16.5.tar.xz b/discover-5.16.5.tar.xz deleted file mode 100644 index 6017a82..0000000 --- a/discover-5.16.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26c47a5c0f59a31f37da85e894a926c76805b66f91dde8ba6d2de8015842d5c1 -size 10453308 diff --git a/discover-5.16.5.tar.xz.sig b/discover-5.16.5.tar.xz.sig deleted file mode 100644 index 4bde975..0000000 --- a/discover-5.16.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl1ubcUACgkQ7JTRj38F -mX4sEQgAlV0xKWfHh75TQQMl4H0877On9bEJ081HdCCu0k+fJC2bX8Q9m0ojDzFx -2YZSV7lnldo1t1l2Y+zpNpLwMOZerwGcpJhzN1rKfvEYekl+pVLhkMJHnTclTdWx -+F3nlbtKvtRKbKc1mdb9qC+bCOiUWzGHCLwIW2WmBac65Tk/yvhuGFoYBSlAJpMC -MJTW8mBgRX6sHPRkvwCGyXGLwKieC+EE5ax3S9V+7d54Gti85VH/RAfATHjjGQKg -wYFlGApEm/wTjx5fqTWH79nTO/83n+VJZZIxWGg6BCeeJdqOocG7OQvm6ibvAHfH -l/kHptE5hJC1D0iaOcmDTLl5C2zACw== -=cw6t ------END PGP SIGNATURE----- diff --git a/discover-5.16.90.tar.xz b/discover-5.16.90.tar.xz new file mode 100644 index 0000000..5ad8eab --- /dev/null +++ b/discover-5.16.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8da8f2ff38a672ef0de2d3146fd797c1e08095f31188dd6a936720fd8d916713 +size 10446568 diff --git a/discover-5.16.90.tar.xz.sig b/discover-5.16.90.tar.xz.sig new file mode 100644 index 0000000..e7882fe --- /dev/null +++ b/discover-5.16.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl2DWqEACgkQ7JTRj38F +mX6OzAf+L9m/nxFjo4FvVXqB41OvbRKW+ONTo4tlmFNDUTCnND/y0xyxr0lpcTaX +FycCpNbXQzhGst6Bz8woluE6DhTXdSjZEf4Tjw+7A8HIBr7tir9CnrdnIu8Kt0kW +Auz29G7o6++F6SGXGwWNgrZ7s3w9QqbiymW36vjwrbLlv7RQ76Fwsc6+jE183p9E +34o3pErtZeYxBWBs6tKxTMjP7zobtZtHrdOyzIs6rdPUhDKQX5Ne1N/FQOzaKuX8 +kIV2P3I9SL/KW+QT7tT68gzyJ47LUf2ExgWHQzKwa02ZI0e6ZPTHakFLv64DlMvU +Nh03LOMbYmjc5b/UX6fTiQGLyWw/gg== +=wS9r +-----END PGP SIGNATURE----- diff --git a/discover.changes b/discover.changes index c4ca11d..7548cbe 100644 --- a/discover.changes +++ b/discover.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 19 12:32:33 UTC 2019 - Fabian Vogt + +- Update to 5.16.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.16.90.php +- Too many changes to list here +- Recommend the fwupd backend by default again +- Drop conditions for Leap 42 + ------------------------------------------------------------------- Tue Sep 3 12:44:11 UTC 2019 - Fabian Vogt diff --git a/discover.spec b/discover.spec index ad87297..3ce421b 100644 --- a/discover.spec +++ b/discover.spec @@ -18,32 +18,23 @@ %bcond_without lang Name: discover -Version: 5.16.5 +Version: 5.16.90 Release: 0 Summary: Software store for the KDE Plasma desktop License: GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later Group: System/GUI/KDE Url: https://quickgit.kde.org/?p=discover.git -Source: https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz +Source: discover-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz.sig +Source1: discover-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE Patch1: 0001-Warning-for-FlatHub.patch -%if 0%{?suse_version} < 1330 -# It does not build with the default compiler (GCC 4.8) on Leap 42.x -%if 0%{?sle_version} < 120300 -BuildRequires: gcc6-c++ -%else -BuildRequires: gcc7-c++ -%endif -%endif BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: flatpak-devel BuildRequires: kf5-filesystem -BuildRequires: kirigami2-devel BuildRequires: update-desktop-files BuildRequires: cmake(AppStreamQt) >= 0.11.1 BuildRequires: cmake(KF5Archive) @@ -56,6 +47,7 @@ BuildRequires: cmake(KF5Declarative) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5ItemModels) BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Kirigami2) BuildRequires: cmake(KF5NewStuff) BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5Plasma) @@ -71,9 +63,7 @@ BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(packagekitqt5) >= 1.0.1 -%if 0%{?suse_version} >= 1500 BuildRequires: pkgconfig(fwupd) >= 1.0.6 -%endif Requires: kirigami2 Requires: libqt5-qtquickcontrols2 Recommends: %{name}-lang @@ -81,8 +71,9 @@ Recommends: %{name}-backend-packagekit %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150100 Recommends: %{name}-backend-flatpak %endif -# Disabled for now, reported to cause crashes -# Recommends: %{name}-backend-fwupd +# Conflicts with plasma5-pk-updates +# Recommends: %%{name}-notifier +Recommends: %{name}-backend-fwupd %description Discover is a graphical software manager for the KDE Plasma desktop. It helps users to find software they might want easily and quickly. @@ -97,11 +88,7 @@ Requires: %{name} = %{version} # it's useless without system package management Requires: AppStream Requires: PackageKit -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 Requires: appstream-provider -%else -Requires: libzypp-plugin-appdata -%endif %description backend-packagekit A plugin for Discover to support management of system packages and repositories @@ -125,33 +112,23 @@ Requires: %{name} = %{version} %description backend-fwupd A plugin for Discover to support updates of system firmware using fwupd. -%package plasmoid -Summary: Update notification plasmoid for KDE Software Manager +%package notifier +Summary: Update notifier for KDE Software Manager Group: System/GUI/KDE Conflicts: plasma5-pk-updates +Obsoletes: %{name}-plasmoid < %{version} Requires: %{name} = %{version} -%description plasmoid -This is a plasmoid to notify the user that updates are available and allows the +%description notifier +This is a notifier for Discover to inform the user that updates are available and allows the user to install them using Discover. %lang_package %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build - %if 0%{?suse_version} < 1330 - # It does not build with the default compiler (GCC 4.8) on Leap 42.x - %if 0%{?sle_version} < 120300 - export CC=gcc-6 - export CXX=g++-6 - %else - export CC=gcc-7 - export CXX=g++-7 - %endif - %endif %cmake_kf5 -d build %make_jobs @@ -164,12 +141,11 @@ user to install them using Discover. %if %{with lang} %find_lang libdiscover %{name}.lang - %find_lang plasma-discover-notifier %{name}.lang %find_lang plasma-discover %{name}.lang - %find_lang plasma_applet_org.kde.discovernotifier plasma.lang + %find_lang plasma-discover-notifier notifier.lang %else - touch plasma.lang + touch notifier.lang %endif %files @@ -178,7 +154,6 @@ user to install them using Discover. %{_kf5_libdir}/plasma-discover/ %dir %{_kf5_plugindir}/discover/ %{_kf5_plugindir}/discover/kns-backend.so -%{_kf5_qmldir}/ %{_kf5_applicationsdir}/org.kde.discover.desktop %{_kf5_applicationsdir}/org.kde.discover.urlhandler.desktop %{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.* @@ -212,19 +187,17 @@ user to install them using Discover. %{_kf5_iconsdir}/hicolor/*/apps/flatpak-discover.svg %endif -%if 0%{?suse_version} >= 1500 %files backend-fwupd %license COPYING* %{_kf5_plugindir}/discover/fwupd-backend.so -%endif -%files plasmoid -f plasma.lang +%files notifier -f notifier.lang %license COPYING* -%dir %{_kf5_sharedir}/plasma -%dir %{_kf5_sharedir}/plasma/plasmoids -%{_kf5_sharedir}/plasma/plasmoids/org.kde.discovernotifier/ -%{_kf5_servicesdir}/plasma-applet-org.kde.discovernotifier.desktop -%{_kf5_plugindir}/discover-notifier/ -%{_kf5_appstreamdir}/org.kde.discovernotifier.appdata.xml +%dir %{_kf5_plugindir}/discover-notifier +%{_kf5_configdir}/autostart/org.kde.discover.notifier.desktop +%{_libdir}/libexec/DiscoverNotifier +%{_kf5_plugindir}/discover-notifier/DiscoverPackageKitNotifier.so +%{_kf5_plugindir}/discover-notifier/FlatpakNotifier.so +%{_kf5_applicationsdir}/org.kde.discover.notifier.desktop %changelog