diff --git a/.gitignore b/.gitignore index 09e1c4b..d75e81c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/kde-cli-tools-5.6.1.tar.xz -/kde-cli-tools-5.6.2.tar.xz -/kde-cli-tools-5.6.3.tar.xz -/kde-cli-tools-5.6.4.tar.xz -/kde-cli-tools-5.6.5.tar.xz +/kde-cli-tools-5.6.95.tar.xz diff --git a/0002-xdg-mime-parses-ktraderclient5-s-output-So-revert-to.patch b/0002-xdg-mime-parses-ktraderclient5-s-output-So-revert-to.patch deleted file mode 100644 index 603feb8..0000000 --- a/0002-xdg-mime-parses-ktraderclient5-s-output-So-revert-to.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 80e0d16e248aad690c14dbfff88881fab6d79415 Mon Sep 17 00:00:00 2001 -From: David Faure -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 - diff --git a/kde-cli-tools.spec b/kde-cli-tools.spec index 93b249b..516c523 100644 --- a/kde-cli-tools.spec +++ b/kde-cli-tools.spec @@ -1,5 +1,5 @@ Name: kde-cli-tools -Version: 5.6.5 +Version: 5.6.95 Release: 1%{?dist} Summary: Tools based on KDE Frameworks 5 to better interact with the system @@ -15,8 +15,6 @@ URL: https://quickgit.kde.org/?p=%{name}.git 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 @@ -104,6 +102,9 @@ ln -s %{_kf5_libexecdir}/kdesu %{buildroot}%{_bindir}/kdesu %changelog +* Sat Jun 25 2016 Rex Dieter - 5.6.95-1 +- 5.6.95 + * Tue Jun 14 2016 Rex Dieter - 5.6.5-1 - 5.6.5 diff --git a/sources b/sources index 2613ad9..bf182b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30a16a0dd46ca2ce36b7fc09355b485d kde-cli-tools-5.6.5.tar.xz +5cf0f76c6f3e6a74bbdcf22742b91ba0 kde-cli-tools-5.6.95.tar.xz