update in the right project
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=122
This commit is contained in:
Hrvoje Senjan
Git OBS Bridge
parent
9dfba17b60
commit
a262db36ae
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:baa03619271003e8127f270b1eb1e5e4150380f5ee4e5114da1b0f3b6bd9aa4a
|
||||
size 489072
|
||||
3
kde-cli-tools-5.7.95.tar.xz
Normal file
3
kde-cli-tools-5.7.95.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dee0c2c41401ced2ff6d74850dcbf3ac9851d19eaab9f20b6610a466a74999a8
|
||||
size 486416
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de
|
||||
|
||||
- Update to 5.7.95 (Plasma 5.8 Beta)
|
||||
* New LTS feature release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.7.95.php
|
||||
- Removed patch kdesu-Do-not-change-minimum-size.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de
|
||||
|
||||
|
||||
@ -18,17 +18,15 @@
|
||||
|
||||
%bcond_without lang
|
||||
Name: kde-cli-tools5
|
||||
Version: 5.7.5
|
||||
Version: 5.7.95
|
||||
Release: 0
|
||||
Summary: Additional CLI tools for KDE applications
|
||||
License: GPL-2.0+
|
||||
Group: System/GUI/KDE
|
||||
Url: http://www.kde.org
|
||||
Source: http://download.kde.org/stable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz
|
||||
Source: http://download.kde.org/unstable/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
|
||||
Patch1: kdesu-Do-not-change-minimum-size.patch
|
||||
BuildRequires: extra-cmake-modules >= 1.3.0
|
||||
BuildRequires: kf5-filesystem
|
||||
BuildRequires: xz
|
||||
@ -65,7 +63,6 @@ Additional CLI tools for KDE applications and workspaces.
|
||||
%prep
|
||||
%setup -q -n kde-cli-tools-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
From: Christoph Feck <cfeck@kde.org>
|
||||
Date: Thu, 21 Jul 2016 21:34:02 +0000
|
||||
Subject: Do not change minimumSize()
|
||||
X-Git-Url: http://quickgit.kde.org/?p=kde-cli-tools.git&a=commitdiff&h=dc023ba3cbd6e6fcbe8a6b13e1796a2c0744a5a2
|
||||
---
|
||||
Do not change minimumSize()
|
||||
|
||||
KPasswordDialog knows better.
|
||||
---
|
||||
|
||||
|
||||
--- a/kdesu/sudlg.cpp
|
||||
+++ b/kdesu/sudlg.cpp
|
||||
@@ -59,8 +59,6 @@
|
||||
if( withIgnoreButton ) {
|
||||
connect(buttonBox()->button(QDialogButtonBox::Ignore), SIGNAL(clicked()), SLOT(slotUser1()));
|
||||
}
|
||||
-
|
||||
- setMinimumSize(minimumSizeHint());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -8,14 +8,14 @@ Furthermore, make the kdesu 'command' translatable, it's used
|
||||
in openSUSE with dolphin and konsole 'Start as root'
|
||||
BUG: boo#852256
|
||||
---
|
||||
kdesu/kdesu.cpp | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
kdesu/kdesu.cpp | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
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[])
|
||||
diff --git a/kdesu/kdesu.cpp b/kdesu/kdesu.cpp
|
||||
index 9e7f173..f553422 100644
|
||||
--- a/kdesu/kdesu.cpp
|
||||
+++ b/kdesu/kdesu.cpp
|
||||
@@ -160,11 +160,11 @@
|
||||
|
||||
if (result == 127)
|
||||
{
|
||||
@ -29,7 +29,7 @@ Index: kde-cli-tools-5.7.5/kdesu/kdesu.cpp
|
||||
}
|
||||
|
||||
return result;
|
||||
@@ -199,7 +199,7 @@ static int startApp(QCommandLineParser&
|
||||
@@ -199,7 +199,7 @@
|
||||
prompt = false;
|
||||
|
||||
// Get target uid
|
||||
@ -38,7 +38,7 @@ Index: kde-cli-tools-5.7.5/kdesu/kdesu.cpp
|
||||
QByteArray auth_user = user;
|
||||
struct passwd *pw = getpwnam(user);
|
||||
if (pw == 0L)
|
||||
@@ -259,7 +259,7 @@ static int startApp(QCommandLineParser&
|
||||
@@ -259,7 +259,7 @@
|
||||
// Get command
|
||||
if (p.isSet("c"))
|
||||
{
|
||||
@ -47,7 +47,7 @@ Index: kde-cli-tools-5.7.5/kdesu/kdesu.cpp
|
||||
// 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
|
||||
@@ -347,7 +347,7 @@ static int startApp(QCommandLineParser&
|
||||
@@ -347,7 +347,7 @@
|
||||
// }
|
||||
|
||||
KUser u;
|
||||
@ -56,7 +56,7 @@ Index: kde-cli-tools-5.7.5/kdesu/kdesu.cpp
|
||||
|
||||
if (keep && !terminal && !just_started)
|
||||
{
|
||||
@@ -459,7 +459,7 @@ static int startApp(QCommandLineParser&
|
||||
@@ -459,7 +459,7 @@
|
||||
}
|
||||
else if (keep && have_daemon)
|
||||
{
|
||||
@ -65,7 +65,7 @@ Index: kde-cli-tools-5.7.5/kdesu/kdesu.cpp
|
||||
client.setPriority(priority);
|
||||
client.setScheduler(scheduler);
|
||||
int result = client.exec(command, user, options, env);
|
||||
@@ -478,7 +478,7 @@ static int startApp(QCommandLineParser&
|
||||
@@ -478,7 +478,7 @@
|
||||
proc.setPriority(priority);
|
||||
proc.setScheduler(scheduler);
|
||||
proc.setCommand(command);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user