ktraderclient5 upstream revert was only in master/ branch? Pull in (dropped) fix into packaging again

epel9
Rex Dieter 9 years ago
parent fe56f5f6e8
commit e445ea8c5d

@ -0,0 +1,35 @@
From 80e0d16e248aad690c14dbfff88881fab6d79415 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sun, 6 Mar 2016 19:09:50 +0100
Subject: [PATCH 2/4] xdg-mime parses ktraderclient5's output! So revert to
outputting all props by default, and make --short output just paths.
---
ktraderclient/ktraderclient.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ktraderclient/ktraderclient.cpp b/ktraderclient/ktraderclient.cpp
index 31330c1..fc233ca 100644
--- a/ktraderclient/ktraderclient.cpp
+++ b/ktraderclient/ktraderclient.cpp
@@ -46,7 +46,7 @@ int main( int argc, char **argv )
parser.addOption(QCommandLineOption(QStringList() << QLatin1String("servicetype"), i18n("A servicetype, like KParts/ReadOnlyPart or KMyApp/Plugin"), QLatin1String("servicetype")));
parser.addOption(QCommandLineOption(QStringList() << QLatin1String("constraint"), i18n("A constraint expressed in the trader query language"), QLatin1String("constraint")));
- parser.addOption(QCommandLineOption(QStringList() << QLatin1String("properties"), i18n("Output all properties")));
+ parser.addOption(QCommandLineOption(QStringList() << QLatin1String("short"), i18n("Output only paths to desktop files")));
parser.process(app);
aboutData.processCommandLine(&parser);
@@ -54,7 +54,7 @@ int main( int argc, char **argv )
const QString mimetype = parser.value("mimetype");
QString servicetype = parser.value("servicetype");
const QString constraint = parser.value("constraint");
- const bool outputProperties = parser.isSet("properties");
+ const bool outputProperties = !parser.isSet("short");
if ( mimetype.isEmpty() && servicetype.isEmpty() )
parser.showHelp();
--
2.7.3

@ -1,6 +1,6 @@
Name: kde-cli-tools
Version: 5.6.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Tools based on KDE Frameworks 5 to better interact with the system
License: GPLv2+
@ -14,6 +14,10 @@ URL: https://quickgit.kde.org/?p=%{name}.git
%endif
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
## upstream patches
# master branch
Patch2: 0002-xdg-mime-parses-ktraderclient5-s-output-So-revert-to.patch
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qtx11extras-devel
@ -100,6 +104,9 @@ ln -s %{_kf5_libexecdir}/kdesu %{buildroot}%{_bindir}/kdesu
%changelog
* Fri Apr 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-2
- ktraderclient5 upstream revert was only in master/ branch? Pull in (dropped) fix into packaging again
* Sat Apr 09 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-1
- 5.6.2

Loading…
Cancel
Save