Accepting request 1073046 from home:krop:applications-23.03.80
OBS-URL: https://build.opensuse.org/request/show/1073046 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=312
This commit is contained in:
Christophe Marin
Git OBS Bridge
parent
6c3ee7ad95
commit
14b232c360
@ -7,16 +7,16 @@ This reverts commit 0bdd8e0b0516555c6233fdc7901e9b417cf89791.
|
||||
We ship a desktop file to open dolphin as root and we allow YaST on the
|
||||
desktop. So this patch is absolutely pointless for us.
|
||||
---
|
||||
src/main.cpp | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
src/main.cpp | 11 -------------
|
||||
1 file changed, 11 deletions(-)
|
||||
|
||||
Index: dolphin-19.11.70git.20220102T020350~f386f848d/src/main.cpp
|
||||
Index: dolphin-19.11.70git.20230131T022613~e4e68b90b/src/main.cpp
|
||||
===================================================================
|
||||
--- dolphin-19.11.70git.20220102T020350~f386f848d.orig/src/main.cpp 2022-01-02 09:31:36.170555336 +0100
|
||||
+++ dolphin-19.11.70git.20220102T020350~f386f848d/src/main.cpp 2022-01-02 09:32:45.570093055 +0100
|
||||
@@ -33,31 +33,8 @@
|
||||
#include <QDBusConnectionInterface>
|
||||
#include <QSessionManager>
|
||||
--- dolphin-19.11.70git.20230131T022613~e4e68b90b.orig/src/main.cpp 2023-01-31 03:26:13.000000000 +0100
|
||||
+++ dolphin-19.11.70git.20230131T022613~e4e68b90b/src/main.cpp 2023-01-31 07:40:48.073527099 +0100
|
||||
@@ -43,25 +43,8 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#ifndef Q_OS_WIN
|
||||
-#include <unistd.h>
|
||||
@ -29,16 +29,10 @@ Index: dolphin-19.11.70git.20220102T020350~f386f848d/src/main.cpp
|
||||
- // Prohibit using sudo or kdesu (but allow using the root user directly)
|
||||
- if (getuid() == 0) {
|
||||
- if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
|
||||
- std::cout << "Running Dolphin with sudo can cause bugs and expose you to security vulnerabilities. "
|
||||
- "Instead use Dolphin normally and you will be prompted for elevated privileges when "
|
||||
- "performing file operations that require them."
|
||||
- << std::endl;
|
||||
- std::cout << "Running Dolphin with sudo can cause bugs and expose you to security vulnerabilities." << std::endl;
|
||||
- return EXIT_FAILURE;
|
||||
- } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
|
||||
- std::cout << "Running Dolphin with kdesu can cause bugs and expose you to security vulnerabilities. "
|
||||
- "Instead use Dolphin normally and you will be prompted for elevated privileges when "
|
||||
- "performing file operations that require them."
|
||||
- << std::endl;
|
||||
- std::cout << "Running Dolphin with kdesu can cause bugs and expose you to security vulnerabilities." << std::endl;
|
||||
- return EXIT_FAILURE;
|
||||
- }
|
||||
- }
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1aa7538f013d24fdf36633d413e7ac23dbdfec7a216de8d01865ce4754760b5a
|
||||
size 5693220
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmP9RI4ACgkQu0YzUNbv
|
||||
Me8PHw//f9mn2jidhCSmtatZuya0kXGNWxCraRnV63w4R1VQBpsw9XB00PSoZix4
|
||||
lx/7Y+f2fBmIet4gkcTjJ5sp6y6fgvwVzFuweKwkZk1h4o3lDTIs+pZAZzwEaqRz
|
||||
LIixLgc5iYOcb3+aJx/ttsD9Z870616Nx7IJgqRA/r5V7KZyhPqMpllKsnA/cBpK
|
||||
PTMKLB2hIcMkxbDxUwddBaUdoRQHzTpxXWO9bCTz0BYDgpNHBMI3rkKYNL3w4uX/
|
||||
Nu8bkzKpCR9oHFMlMuSLlCUB04UFAUM93TSL6bKT5Ef43cRcWBmlNnLD5gu1yH7l
|
||||
Gz1ZwqNVwSL8db98T0UNVORBCmDtoQN0a3O172l6PZubhoKkJkxVnpKjXlimMH4D
|
||||
zxst743syQAQKz/d61+5Bos0+IJq7a4la/g6xd64Zw3DBlfc8olT1KPB8dBa/Xu3
|
||||
YLmypo9i8ng5Eq7mIbkuG4i1GhtkXeOBrqmbqMS6oSY0waO+D7AenCYZOX5z3yVw
|
||||
WBcUevooJRAGGC9lI4GTGTk2ZIcUaT/kKWmcuepz1CHwyxI4+uZAfnl4kA8vdhvD
|
||||
GOKe/uE/JdMTECoyzFImeiHkjrbvOBTIpSIKVt6234bZPTmmrneVbEEt3YYZhp4i
|
||||
QQXWvydUsknKC7PydLw4Qjv5RkV0Yj3E8lMzESSJlR5mODn7KhM=
|
||||
=XZnF
|
||||
-----END PGP SIGNATURE-----
|
||||
3
dolphin-23.03.80.tar.xz
Normal file
3
dolphin-23.03.80.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b1f9af18ee74b6cb6d34746e5b8da833cb412dcbbb8100430ded05f4c2bdd8fa
|
||||
size 5721712
|
||||
16
dolphin-23.03.80.tar.xz.sig
Normal file
16
dolphin-23.03.80.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmQTsikACgkQOmpNuDnq
|
||||
ptdP4w/9H/cADv9kh578TANxYl4s445CaRr2S0v91uh9tcmMJQ4BegGIrdaFz418
|
||||
277Q7nfkyeW00IRcpf5hcDPcDUZmbmJqKrCeK1nygCQmDtWcet5cOAYHhqD2Jtf9
|
||||
BsMBcfrF4v7YGqKcYmTQww9YP1UKFkyff0gSX+XS5Qx2bdJEgI17eJvSzNT9VgmH
|
||||
8VIwbUcp5ywZSrgCnLOoQr6v66LSg8x0wWWn2w6QZOT/enmWyvLnG4HjV8bI9aKz
|
||||
UFghRxhZAGZKzFs92Mk9Gz1Iv1Yjkso0eXb3r/OweusxjyG4Q8bRqLwJuPA/89Nw
|
||||
CJQjPHhMLbaji2/zlc6Fh0b6Af+H4M/WEW3h9Fw1oruxyGyaTLWm61UgHxu8rOH/
|
||||
1HjJ4U+Yp4GHr7v0Xt71UmKv2QQaRLbFN+Ytxm28Lw/BI+Jgl24vRzfR9lYH/5Ki
|
||||
JN+RY+FIFlYFI75vkWjS2/iAZuoWykaOkczir3KnP2qbRCkqa2wYMAbbkMJerLjq
|
||||
wzL9d5csCRDb9PwZtl4cTi5o9/u58HbQIUbJt+PyVCuR+l2wGXxKoOqntRkCv9aX
|
||||
9yh6f24PAPv527tK6XHEPT0f2Pox4oINnb37e5uudSvltIghWZyhYhWlVpfKZfRr
|
||||
Zr2yMN8ajitXbu/4KX1FGwc+IKkUDDdxpxqTGxMBpPstdJ/Np9g=
|
||||
=k6Kj
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,8 +1,8 @@
|
||||
Index: dolphin-19.11.70git.20210328T171136~9e8e58147/src/dolphinui.rc
|
||||
Index: dolphin-19.11.70git.20230101T031501~0c1157f3/src/dolphinui.rc
|
||||
===================================================================
|
||||
--- dolphin-19.11.70git.20210328T171136~9e8e58147.orig/src/dolphinui.rc 2021-03-28 17:11:36.000000000 +0200
|
||||
+++ dolphin-19.11.70git.20210328T171136~9e8e58147/src/dolphinui.rc 2021-03-30 06:57:59.350537061 +0200
|
||||
@@ -116,6 +116,7 @@
|
||||
--- dolphin-19.11.70git.20230101T031501~0c1157f3.orig/src/dolphinui.rc
|
||||
+++ dolphin-19.11.70git.20230101T031501~0c1157f3/src/dolphinui.rc
|
||||
@@ -105,6 +105,7 @@
|
||||
<text context="@title:menu">Main Toolbar</text>
|
||||
<Action name="go_back" />
|
||||
<Action name="go_forward" />
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 17 20:42:56 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 23.03.80
|
||||
* New feature release
|
||||
- Rebase patches:
|
||||
* dolphin-go_up.diff
|
||||
* 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 28 09:45:29 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
||||
25
dolphin.spec
25
dolphin.spec
@ -16,18 +16,16 @@
|
||||
#
|
||||
|
||||
|
||||
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
||||
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||
%bcond_without released
|
||||
Name: dolphin
|
||||
Version: 22.12.3
|
||||
Version: 23.03.80
|
||||
Release: 0
|
||||
Summary: KDE File Manager
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://apps.kde.org/dolphin
|
||||
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
%if %{with released}
|
||||
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source2: applications.keyring
|
||||
%endif
|
||||
Source3: dolphinsu.desktop
|
||||
@ -64,6 +62,7 @@ BuildRequires: cmake(Qt5Core)
|
||||
BuildRequires: cmake(Qt5DBus)
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5Widgets)
|
||||
BuildRequires: cmake(Qt5X11Extras)
|
||||
Requires: baloo5-kioslaves
|
||||
Requires: dolphin-part = %{version}-%{release}
|
||||
Recommends: kio-extras5
|
||||
@ -75,7 +74,9 @@ This package contains the default file manager of KDE Workspaces.
|
||||
|
||||
%package part
|
||||
Summary: KDE File Manager
|
||||
%if %{with released}
|
||||
%requires_ge kio
|
||||
%endif
|
||||
Obsoletes: dolphin5-part
|
||||
|
||||
%description part
|
||||
@ -96,6 +97,15 @@ Provides: dolphin5-devel = %{version}
|
||||
%description devel
|
||||
This package contains the libraries used by Dolphin and Konqueror.
|
||||
|
||||
%package zsh-completion
|
||||
Summary: ZSH completion for %{name}
|
||||
Requires: %{name} = %{version}
|
||||
Supplements: packageand(%{name}:zsh)
|
||||
BuildArch: noarch
|
||||
|
||||
%description zsh-completion
|
||||
ZSH command line completion support for %{name}.
|
||||
|
||||
%package -n %{name}-part-lang
|
||||
Summary: Translations for package %{name}
|
||||
Requires: %{name}-part = %{version}
|
||||
@ -162,6 +172,11 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_kf5_applicationsdir}/org.kde.dolphi
|
||||
%files -n libdolphinvcs5
|
||||
%{_kf5_libdir}/libdolphinvcs.so.*
|
||||
|
||||
%files zsh-completion
|
||||
%dir %{_datadir}/zsh
|
||||
%dir %{_datadir}/zsh/site-functions
|
||||
%{_datadir}/zsh/site-functions/_dolphin
|
||||
|
||||
%files devel
|
||||
%{_includedir}/dolphinvcs_export.h
|
||||
%{_kf5_cmakedir}/DolphinVcs/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user