Accepting request 340429 from KDE:Applications

1

OBS-URL: https://build.opensuse.org/request/show/340429
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dolphin?expand=0&rev=3

dolphin.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 21 16:34:29 UTC 2015 - wbauer@tmo.at
+
+- Install dolphinsu.desktop as org.kde.dolphinsu.desktop to prevent
+  it being overridden by an old KDE4 entry in ~/.local/share/applications/
+
+-------------------------------------------------------------------
+Mon Oct 19 10:31:42 UTC 2015 - wbauer@tmo.at
+
+- Fix dolphinsu.desktop: the KF5 based dolphin doesn't support
+  "-caption" any more (boo#950907)
+
 -------------------------------------------------------------------
 Sun Oct 11 13:15:54 UTC 2015 - tittiatcoke@gmail.com
 

dolphin.spec

@@ -101,7 +101,7 @@ This package contains the libraries used by Dolphin and Konqueror.
 %install
   %kf5_makeinstall -C build
 
-  install -D -m 0644 %{SOURCE1} %{buildroot}%{_kf5_applicationsdir}
+  install -D -m 0644 %{SOURCE1} %{buildroot}%{_kf5_applicationsdir}/org.kde.dolphinsu.desktop
   %suse_update_desktop_file org.kde.dolphin          System FileManager
 
   rm -rfv %{buildroot}%{_kf5_libdir}/libdolphinprivate.so
@@ -125,7 +125,7 @@ This package contains the libraries used by Dolphin and Konqueror.
 %{_kf5_libdir}/libkdeinit5_dolphin.so
 %{_kf5_bindir}/dolphin
 %{_kf5_applicationsdir}/org.kde.dolphin.desktop
-%{_kf5_applicationsdir}/dolphinsu.desktop
+%{_kf5_applicationsdir}/org.kde.dolphinsu.desktop
 %dir %{_kf5_sharedir}/kxmlgui5
 %dir %{_kf5_sharedir}/kxmlgui5/dolphin
 %{_kf5_sharedir}/kxmlgui5/dolphin/dolphinui.rc

dolphinsu.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=File Manager - Super User Mode
-Exec=dbus-launch dolphin %i -caption "%c" "%u"
+Exec=dbus-launch dolphin %i -qwindowtitle "%c" "%u"
 Icon=system-file-manager
 Type=Application
 X-DocPath=dolphin/index.html