pool/dolphin
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 490347 from KDE:Applications

Browse Source 
KDE Applications 17.04.0 final

OBS-URL: https://build.opensuse.org/request/show/490347
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dolphin?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2017-05-08 16:46:16 +00:00 committed by Git OBS Bridge
commit e00e795c13
5 changed files with 121 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch Normal file
View File

@ -0,0 +1,41 @@
From ba74d639178916221c748b0d5d89f7ac4f5ed669 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 22 Apr 2017 14:00:33 +0200
Subject: [PATCH] Revert "Disallow executing Dolphin as root on Linux"
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(-)
diff --git a/src/main.cpp b/src/main.cpp
index 789a52996..acba8daed 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,21 +35,8 @@
#include <KLocalizedString>
#include <Kdelibs4ConfigMigrator>
-#ifndef Q_OS_WIN
-#include <unistd.h>
-#endif
-#include <iostream>
-
extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
{
-#ifndef Q_OS_WIN
- // Check whether we are running as root
- if (getuid() == 0) {
- std::cout << "Executing Dolphin as root is not possible." << std::endl;
- return EXIT_FAILURE;
- }
-#endif
-
QApplication app(argc, argv);
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
--
2.12.0

3
dolphin-16.12.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62f1392a25692bc7ff0ffba89b1949beba3cba0f78bdf6acdf97ac2897a46578
size 676192

3
dolphin-17.04.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be98d39a63e1fb9a77d79fbb04019cecaf0452d0616d518518e71d2c3fbe2227
size 4714124

61
dolphin.changes
View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Sat Apr 22 12:02:11 UTC 2017 - fabian@ritter-vogt.de
- Add patch to re-allow running dolphin as root:
* 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch
-------------------------------------------------------------------
Sun Apr 16 10:44:46 CEST 2017 - lbeltrame@kde.org
- Update to 17.04.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.04.0.php
- Changes since 17.03.90:
* None
-------------------------------------------------------------------
Wed Apr 12 20:25:14 CEST 2017 - lbeltrame@kde.org
- Update to 17.03.90
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.04-rc.php
- Changes since 17.03.80:
* Update name of the delete action in the .rc files
* behavior change -> New Window opens with same URL
-------------------------------------------------------------------
Sat Mar 25 23:10:08 CET 2017 - lbeltrame@kde.org
- Update to 17.03.80
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.03.80.php
- Changes since 16.12.3:
* Too many changes to list here
-------------------------------------------------------------------
Thu Mar 9 12:34:01 CET 2017 - lbeltrame@kde.org
@ -20,14 +57,14 @@ Thu Feb 9 06:41:10 UTC 2017 - lbeltrame@kde.org
Sat Jan 14 08:49:44 UTC 2017 - lbeltrame@kde.org
- - Update to KDE Applications 16.12.1
* KDE Applications 16.12.1
* KDE Applications 16.12.1
* https://www.kde.org/announcements/announce-applications-16.12.1.php
-------------------------------------------------------------------
Tue Dec 13 19:29:45 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.12.0
* KDE Applications 16.12.0
* KDE Applications 16.12.0
* https://www.kde.org/announcements/announce-applications-16.12.0.php
@ -131,7 +168,7 @@ Sat May 7 10:11:20 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.04.1
* KDE Applications 16.04.1
* https://www.kde.org/announcements/announce-applications-16.04.1.php
- Drop upstreamed patch specify-fallback-icon.patch
@ -170,7 +207,7 @@ Fri Mar 25 16:37:37 UTC 2016 - wbauer@tmo.at
Sun Mar 13 15:34:13 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 15.12.3
* KDE Applications 15.12.3
* KDE Applications 15.12.3
* https://www.kde.org/announcements/announce-applications-15.12.3.php
* boo#970855
@ -186,7 +223,7 @@ Fri Feb 26 15:34:41 UTC 2016 - wbauer@tmo.at
Sat Feb 13 08:01:04 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 15.12.2
* KDE Applications 15.12.2
* KDE Applications 15.12.2
* https://www.kde.org/announcements/announce-applications-15.12.2.php
* boo#966605
@ -212,7 +249,7 @@ Thu Jan 14 19:55:08 UTC 2016 - wbauer@tmo.at
Sat Jan 9 18:10:05 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 15.12.1
* KDE Applications 15.12.1
* KDE Applications 15.12.1
* https://www.kde.org/announcements/announce-applications-15.12.1.php
* boo#961265
@ -221,7 +258,7 @@ Sat Jan 9 18:10:05 UTC 2016 - tittiatcoke@gmail.com
Sun Dec 13 12:55:17 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 15.12.0
* KDE Applications 15.12.0
* KDE Applications 15.12.0
* https://www.kde.org/announcements/announce-applications-15.12.0.php
* boo#958887
@ -229,18 +266,18 @@ Sun Dec 13 12:55:17 UTC 2015 - tittiatcoke@gmail.com
-------------------------------------------------------------------
Sun Nov 29 11:00:17 UTC 2015 - tittiatcoke@gmail.com
- Move the installed appdata file to the correct naming to
- Move the installed appdata file to the correct naming to
fix bnc#957041
-------------------------------------------------------------------
Tue Nov 10 19:53:17 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 15.08.3
* KDE Applications 15.08.3
* KDE Applications 15.08.3
* https://www.kde.org/announcements/announce-applications-15.08.3.php
* boo#954531
- Drop upstreamed patch:
- Drop upstreamed patch:
allow-home-directories-with-non-local-file-paths.patch
-------------------------------------------------------------------
@ -265,7 +302,7 @@ Mon Oct 19 10:31:42 UTC 2015 - wbauer@tmo.at
Sun Oct 11 13:15:54 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 15.08.2
* KDE Applications 15.08.2
* KDE Applications 15.08.2
* https://www.kde.org/announcements/announce-applications-15.08.2.php
@ -273,7 +310,7 @@ Sun Oct 11 13:15:54 UTC 2015 - tittiatcoke@gmail.com
Sun Sep 13 18:56:33 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 15.08.1
* KDE Applications 15.08.1
* KDE Applications 15.08.1
* https://www.kde.org/announcements/announce-applications-15.08.1.php

37
dolphin.spec
View File

@ -16,19 +16,23 @@
#
%bcond_without lang
Name: dolphin
Version: 16.12.3
Version: 17.04.0
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA)
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: KDE File Manager
License: GPL-2.0+
Group: Productivity/File utilities
Url: http://www.kde.org/
Url: http://www.kde.org
Source: dolphin-%{version}.tar.xz
Source1: dolphinsu.desktop
Patch0: dolphin-go_up.diff
# PATCH-FIX-OPENSUSE
Patch1: 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch
BuildRequires: baloo5-devel
BuildRequires: baloo5-widgets-devel
BuildRequires: extra-cmake-modules >= 1.6.0
@ -65,6 +69,7 @@ Requires: dolphin-part = %{version}-%{release}
Recommends: kio-extras5
Recommends: konsole-part
Obsoletes: dolphin5
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -96,9 +101,14 @@ Provides: dolphin5-devel = %{version}
%description devel
This package contains the libraries used by Dolphin and Konqueror.
%if %{with lang}
%lang_package
%endif
%prep
%setup -q -n dolphin-%{version}
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build
@ -106,6 +116,10 @@ This package contains the libraries used by Dolphin and Konqueror.
%install
%kf5_makeinstall -C build
%if %{with lang}
%find_lang %{name} --with-man --all-name
%kf5_find_htmldocs
%endif
install -D -m 0644 %{SOURCE1} %{buildroot}%{_kf5_applicationsdir}/org.kde.dolphinsu.desktop
%suse_update_desktop_file org.kde.dolphin System FileManager
@ -113,14 +127,14 @@ This package contains the libraries used by Dolphin and Konqueror.
rm -rfv %{buildroot}%{_kf5_libdir}/libdolphinprivate.so
find %{buildroot} -type f -name '*filenamesearch*' -exec rm -fv {} ';'
%post -n dolphin-part -p /sbin/ldconfig
%postun -n dolphin-part -p /sbin/ldconfig
%post -n dolphin -p /sbin/ldconfig
%postun -n dolphin -p /sbin/ldconfig
%post part -p /sbin/ldconfig
%postun part -p /sbin/ldconfig
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post -n libdolphinvcs5 -p /sbin/ldconfig
%postun -n libdolphinvcs5 -p /sbin/ldconfig
%files -n dolphin
%files
%defattr(-,root,root)
%doc COPYING* README
%{_kf5_libdir}/libkdeinit5_dolphin.so
@ -140,7 +154,7 @@ This package contains the libraries used by Dolphin and Konqueror.
%{_datadir}/dbus-1/interfaces/org.freedesktop.FileManager1.xml
%{_datadir}/dbus-1/services/org.kde.dolphin.FileManager1.service
%files -n dolphin-part
%files part
%defattr(-,root,root)
%doc COPYING* README
%{_kf5_libdir}/libdolphinprivate.so.*
@ -177,4 +191,9 @@ This package contains the libraries used by Dolphin and Konqueror.
%{_kf5_prefix}/include/dolphin_export.h
%{_includedir}/dolphinvcs_export.h
%if %{with lang}
%files lang -f %{name}.lang
%doc COPYING*
%endif
%changelog