diff --git a/kde-cli-tools-5.7.4.tar.xz b/kde-cli-tools-5.7.4.tar.xz deleted file mode 100644 index a7add33..0000000 --- a/kde-cli-tools-5.7.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:978c64bc0c5450528888467fb4e6aee1f3d2c3aefb1714da611a7fd131fa4d60 -size 486136 diff --git a/kde-cli-tools-5.7.5.tar.xz b/kde-cli-tools-5.7.5.tar.xz new file mode 100644 index 0000000..1277ffd --- /dev/null +++ b/kde-cli-tools-5.7.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baa03619271003e8127f270b1eb1e5e4150380f5ee4e5114da1b0f3b6bd9aa4a +size 489072 diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 951052a..5e9e54b 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.5 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.5.php +- Refresh kdesu-add-some-i18n-love.patch and add new change + ------------------------------------------------------------------- Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 785b3cb..2e6f464 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -18,13 +18,13 @@ %bcond_without lang Name: kde-cli-tools5 -Version: 5.7.4 +Version: 5.7.5 Release: 0 Summary: Additional CLI tools for KDE applications License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source: kde-cli-tools-%{version}.tar.xz +Source: http://download.kde.org/stable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 Patch0: kdesu-add-some-i18n-love.patch # PATCH-FIX-UPSTREAM kdesu-Do-not-change-minimum-size.patch boo#958785 -- prevent the displayed command line text running into the password field diff --git a/kdesu-add-some-i18n-love.patch b/kdesu-add-some-i18n-love.patch index d5dfd48..8339634 100644 --- a/kdesu-add-some-i18n-love.patch +++ b/kdesu-add-some-i18n-love.patch @@ -8,23 +8,28 @@ Furthermore, make the kdesu 'command' translatable, it's used in openSUSE with dolphin and konsole 'Start as root' BUG: boo#852256 --- - kdesu/kdesu.cpp | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) + kdesu/kdesu.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) -diff --git a/kdesu/kdesu.cpp b/kdesu/kdesu.cpp -index 9e7f173..f553422 100644 ---- a/kdesu/kdesu.cpp -+++ b/kdesu/kdesu.cpp -@@ -140,7 +140,7 @@ int main(int argc, char *argv[]) +Index: kde-cli-tools-5.7.5/kdesu/kdesu.cpp +=================================================================== +--- kde-cli-tools-5.7.5.orig/kdesu/kdesu.cpp ++++ kde-cli-tools-5.7.5/kdesu/kdesu.cpp +@@ -160,11 +160,11 @@ int main(int argc, char *argv[]) if (result == 127) { - KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command))); + KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromUtf8(command))); } + if (result == -2) + { +- KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command))); ++ KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromUtf8(command))); + } return result; -@@ -175,7 +175,7 @@ static int startApp(QCommandLineParser& p) +@@ -199,7 +199,7 @@ static int startApp(QCommandLineParser& prompt = false; // Get target uid @@ -33,7 +38,7 @@ index 9e7f173..f553422 100644 QByteArray auth_user = user; struct passwd *pw = getpwnam(user); if (pw == 0L) -@@ -235,7 +235,7 @@ static int startApp(QCommandLineParser& p) +@@ -259,7 +259,7 @@ static int startApp(QCommandLineParser& // Get command if (p.isSet("c")) { @@ -42,7 +47,7 @@ index 9e7f173..f553422 100644 // Accepting additional arguments here is somewhat weird, // but one can conceive use cases: have a complex command with // redirections and additional file names which need to be quoted -@@ -323,7 +323,7 @@ static int startApp(QCommandLineParser& p) +@@ -347,7 +347,7 @@ static int startApp(QCommandLineParser& // } KUser u; @@ -51,7 +56,7 @@ index 9e7f173..f553422 100644 if (keep && !terminal && !just_started) { -@@ -429,7 +429,7 @@ static int startApp(QCommandLineParser& p) +@@ -459,7 +459,7 @@ static int startApp(QCommandLineParser& } else if (keep && have_daemon) { @@ -60,7 +65,7 @@ index 9e7f173..f553422 100644 client.setPriority(priority); client.setScheduler(scheduler); int result = client.exec(command, user, options, env); -@@ -448,7 +448,7 @@ static int startApp(QCommandLineParser& p) +@@ -478,7 +478,7 @@ static int startApp(QCommandLineParser& proc.setPriority(priority); proc.setScheduler(scheduler); proc.setCommand(command); @@ -69,6 +74,3 @@ index 9e7f173..f553422 100644 return result; } return -1; --- -1.8.4.4 -