From 6db11c9717a5b354af97661dfb6f633cfd9c57ca7c8b8b70c0e05fab6af3e67b Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Mon, 30 Oct 2017 17:05:02 +0000 Subject: [PATCH] Accepting request 537415 from home:Vogtinator:branches:KDE:Applications - Don't try to install Home.desktop in /usr/share/applications, the copy from plasma5-workspace (by kio_desktop) should be used instead (boo#1058743) OBS-URL: https://build.opensuse.org/request/show/537415 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=45 --- konqueror.changes | 7 +++++++ konqueror.spec | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/konqueror.changes b/konqueror.changes index 64e523c..b3ae851 100644 --- a/konqueror.changes +++ b/konqueror.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Oct 29 13:12:02 UTC 2017 - fabian@ritter-vogt.de + +- Don't try to install Home.desktop in /usr/share/applications, + the copy from plasma5-workspace (by kio_desktop) should be used + instead (boo#1058743) + ------------------------------------------------------------------- Tue Oct 17 00:32:26 CEST 2017 - lbeltrame@kde.org diff --git a/konqueror.spec b/konqueror.spec index 1faee8b..8a777e9 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -128,8 +128,6 @@ sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAK %endif find %{buildroot} -type f -name '*filenamesearch*' -exec rm -fv {} ';' - # Needed by various other scripts, but disabled in git - cp sidebar/default_entries/home.desktop %{buildroot}%{_kf5_applicationsdir}/Home.desktop %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -157,7 +155,6 @@ sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAK %dir %{_kf5_sharedir}/kxmlgui5 %doc %lang(en) %{_kf5_htmldir}/en %{_datadir}/kcmcss/ -%{_kf5_applicationsdir}/Home.desktop %{_kf5_applicationsdir}/kfmclient.desktop %{_kf5_applicationsdir}/kfmclient_dir.desktop %{_kf5_applicationsdir}/kfmclient_html.desktop