From 9dd7eb6014c4f254c76c1bab10de5806fc5d719331fa7107546f17462d19e622 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 14 Jan 2017 01:08:55 +0000 Subject: [PATCH] Accepting request 450204 from home:Vogtinator:plasma59 Update to Plasma 5.9 Beta OBS-URL: https://build.opensuse.org/request/show/450204 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=63 --- ...en-running-.desktop-files-with-runse.patch | 27 ---------------- ...-repository-configuration-if-present.patch | 32 ------------------- discover-5.8.5.tar.xz | 3 -- discover-5.8.95.tar.xz | 3 ++ discover.changes | 15 +++++++++ discover.spec | 26 +++++++-------- 6 files changed, 29 insertions(+), 77 deletions(-) delete mode 100644 0001-Fix-arguments-when-running-.desktop-files-with-runse.patch delete mode 100644 0002-Also-expose-YaST-repository-configuration-if-present.patch delete mode 100644 discover-5.8.5.tar.xz create mode 100644 discover-5.8.95.tar.xz diff --git a/0001-Fix-arguments-when-running-.desktop-files-with-runse.patch b/0001-Fix-arguments-when-running-.desktop-files-with-runse.patch deleted file mode 100644 index cafb637..0000000 --- a/0001-Fix-arguments-when-running-.desktop-files-with-runse.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2db9081b379614ecc19331634d31ca827b9cf9e6 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 27 Dec 2016 18:53:40 +0100 -Subject: [PATCH 1/2] Fix arguments when running .desktop files with runservice - -Without this patch the command run with runservice has a duplicate first argument -as QProcess already prepends the executable name. ---- - libdiscover/backends/PackageKitBackend/runservice/main.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libdiscover/backends/PackageKitBackend/runservice/main.cpp b/libdiscover/backends/PackageKitBackend/runservice/main.cpp -index b56917a..693d80c 100644 ---- a/libdiscover/backends/PackageKitBackend/runservice/main.cpp -+++ b/libdiscover/backends/PackageKitBackend/runservice/main.cpp -@@ -39,5 +39,7 @@ int main(int argc, char** argv) - QTextStream cerr(stderr); - KIO::DesktopExecParser execParser(_service, {}); - -- return !QProcess::startDetached(KIO::DesktopExecParser::executableName(_service.exec()), execParser.resultingArguments()); -+ auto args = execParser.resultingArguments(); -+ const auto execName = args.takeFirst(); -+ return !QProcess::startDetached(execName, args); - } --- -2.10.2 - diff --git a/0002-Also-expose-YaST-repository-configuration-if-present.patch b/0002-Also-expose-YaST-repository-configuration-if-present.patch deleted file mode 100644 index 28e90ec..0000000 --- a/0002-Also-expose-YaST-repository-configuration-if-present.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4b128419571bb2f45f1dfbdab21ae5419e02d77b Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 27 Dec 2016 18:57:35 +0100 -Subject: [PATCH 2/2] Also expose YaST repository configuration if present - -Like "Expose software-properties-kde if present", but for openSUSE. ---- - libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp -index 3421cd1..3db1ad4 100644 ---- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp -+++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp -@@ -99,7 +99,13 @@ PackageKitBackend::PackageKitBackend(QObject* parent) - connect(updateAction, &QAction::triggered, this, &PackageKitBackend::refreshDatabase); - m_messageActions += updateAction; - -- const auto service = locateService(QStringLiteral("software-properties-kde.desktop")); -+ // Kubuntu-based -+ auto service = locateService(QStringLiteral("software-properties-kde.desktop")); -+ if (!service.isEmpty()) -+ m_messageActions += createActionForService(service); -+ -+ // openSUSE-based -+ service = locateService(QStringLiteral("YaST2/sw_source.desktop")); - if (!service.isEmpty()) - m_messageActions += createActionForService(service); - --- -2.10.2 - diff --git a/discover-5.8.5.tar.xz b/discover-5.8.5.tar.xz deleted file mode 100644 index b56d734..0000000 --- a/discover-5.8.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f22b0912f746eb2de60244381f730ad27e406a6161df91d7cca108ef5ac263b -size 9201212 diff --git a/discover-5.8.95.tar.xz b/discover-5.8.95.tar.xz new file mode 100644 index 0000000..dc848cd --- /dev/null +++ b/discover-5.8.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efb50310713072ae05d96ac4c5415ddc810d3dcdd1da283b791255e2c9dfea96 +size 9648576 diff --git a/discover.changes b/discover.changes index d13e29b..3c2e7e9 100644 --- a/discover.changes +++ b/discover.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jan 12 20:39:58 UTC 2017 - fabian@ritter-vogt.de + +- Update to 5.8.95 (Plasma 5.9 Beta) + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.8.95.php +- Changes: + * See https://www.kde.org/announcements/plasma-5.8.5-5.8.95-changelog.php#discover +- Remove patches, now upstream: + * 0001-Fix-arguments-when-running-.desktop-files-with-runse.patch + * 0002-Also-expose-YaST-repository-configuration-if-present.patch +- Update BuildRequires: + * Uses kirigami2 now + ------------------------------------------------------------------- Tue Dec 27 18:31:45 UTC 2016 - fabian@ritter-vogt.de diff --git a/discover.spec b/discover.spec index d0e437b..cab6445 100644 --- a/discover.spec +++ b/discover.spec @@ -1,7 +1,7 @@ # # spec file for package discover # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,24 +18,20 @@ %bcond_without lang Name: discover -Version: 5.8.5 +Version: 5.8.95 Release: 0 Summary: KDE Software Installer License: GPL-2.0 Group: System/GUI/KDE Url: https://quickgit.kde.org/?p=discover.git -Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM 0001-Fix-arguments-when-running-.desktop-files-with-runse.patch fabian@ritter-vogt.de -- Fix arguments when running .desktop files with runservice -Patch1: 0001-Fix-arguments-when-running-.desktop-files-with-runse.patch -# PATCH-FIX-UPSTREAM 0002-Also-expose-YaST-repository-configuration-if-present.patch fabian@ritter-vogt.de -- Also expose YaST repository configuration if present -Patch2: 0002-Also-expose-YaST-repository-configuration-if-present.patch +Source: http://download.kde.org/unstable/plasma/%{version}/%{name}-%{version}.tar.xz BuildRequires: PackageKit-Qt5-devel BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem -BuildRequires: kirigami-devel >= 1.1.0 -BuildRequires: libAppstreamQt-devel +BuildRequires: kirigami2-devel BuildRequires: update-desktop-files +BuildRequires: cmake(AppStreamQt) >= 0.10 BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5Attica) BuildRequires: cmake(KF5Config) @@ -44,6 +40,7 @@ BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5Declarative) BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5ItemModels) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5NewStuff) BuildRequires: cmake(KF5Notifications) @@ -59,7 +56,8 @@ BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) Requires: AppStream -Requires: kirigami >= 1.1.0 +Requires: kirigami2 +Requires: libqt5-qtquickcontrols2 Requires: libzypp-plugin-appdata %if %{with lang} Recommends: %{name}-lang @@ -82,8 +80,6 @@ This is the systray plasmoid to notify the user that updates are available %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build %cmake_kf5 -d build @@ -109,7 +105,6 @@ This is the systray plasmoid to notify the user that updates are available %doc COPYING COPYING.GFDL COPYING.LIB %{_kf5_bindir}/plasma-discover %{_kf5_libdir}/plasma-discover/ -%{_kf5_plugindir}/discover-notifier/ %{_kf5_plugindir}/discover/ %{_kf5_qmldir}/ %{_kf5_applicationsdir}/org.kde.discover.desktop @@ -119,9 +114,9 @@ This is the systray plasmoid to notify the user that updates are available %{_kf5_sharedir}/libdiscover/ %{_kf5_sharedir}/plasmadiscover/ %{_kf5_appstreamdir}/ -%{_kf5_configdir}/discover_ktexteditor_codesnippets_core.knsrc %{_kf5_sharedir}/discover/ -%{_kf5_libdir}/libexec/kf5/discover/ +%{_libdir}/libexec/kf5/discover/ +%config %{_kf5_configdir}/discover_ktexteditor_codesnippets_core.knsrc %if %{with lang} %files lang -f %{name}.lang @@ -135,5 +130,6 @@ This is the systray plasmoid to notify the user that updates are available %dir %{_kf5_sharedir}/plasma/plasmoids %{_kf5_sharedir}/plasma/plasmoids/org.kde.discovernotifier/ %{_kf5_servicesdir}/plasma-applet-org.kde.discovernotifier.desktop +%{_kf5_plugindir}/discover-notifier/ %changelog