diff --git a/.gitignore b/.gitignore index 300a007..10b3ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/kde-baseapps-4.14.3.tar.xz -/kde-baseapps-14.11.97.tar.xz -/kde-baseapps-14.12.1.tar.xz -/kde-baseapps-14.12.2.tar.xz -/kde-baseapps-14.12.3.tar.xz -/kde-baseapps-15.04.0.tar.xz +/kde-baseapps-15.04.1.tar.xz diff --git a/0004-Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch b/0004-Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch deleted file mode 100644 index 47aea84..0000000 --- a/0004-Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 270d2affaafcc9e87ba14f82bfe579e22607e2d2 Mon Sep 17 00:00:00 2001 -From: Emmanuel Pescosta -Date: Thu, 30 Apr 2015 10:12:24 +0200 -Subject: [PATCH 4/5] Use user-places.xbel instead of bookmarks.xml in places - model. - -FIXED-IN: 15.04.1 -CCBUG: 345174 ---- - dolphin/src/panels/places/placesitemmodel.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dolphin/src/panels/places/placesitemmodel.cpp b/dolphin/src/panels/places/placesitemmodel.cpp -index 637bfc1..1702757 100644 ---- a/dolphin/src/panels/places/placesitemmodel.cpp -+++ b/dolphin/src/panels/places/placesitemmodel.cpp -@@ -85,8 +85,8 @@ PlacesItemModel::PlacesItemModel(QObject* parent) : - Baloo::IndexerConfig config; - m_fileIndexingEnabled = config.fileIndexingEnabled(); - #endif -- const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); -- m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); -+ const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel"; -+ m_bookmarkManager = KBookmarkManager::managerForExternalFile(file); - - createSystemBookmarks(); - initializeAvailableDevices(); --- -1.9.3 - diff --git a/kde-baseapps.spec b/kde-baseapps.spec index 0fa9136..1c8cf75 100644 --- a/kde-baseapps.spec +++ b/kde-baseapps.spec @@ -8,8 +8,8 @@ Name: kde-baseapps Summary: KDE Core Applications -Version: 15.04.0 -Release: 3%{?dist} +Version: 15.04.1 +Release: 1%{?dist} License: GPLv2 and GFDL URL: https://projects.kde.org/projects/kde/kde-baseapps @@ -36,7 +36,6 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch Patch5: kde-baseapps-4.14.3-konq_mimetype.patch ## upstream patches -Patch104: 0004-Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch # optional runtime dep for kcm_useraccount, see https://git.reviewboard.kde.org/r/110875/ %if 0%{?fedora} || 0%{?rhel} > 6 @@ -259,7 +258,6 @@ Requires: libkonq%{?_isa} = %{version}-%{release} %patch2 -p2 -b .home-icon %patch3 -p2 -b .kde#228593 %patch5 -p1 -b .konq_mimetype -%patch104 -p1 -b .0004 # not nice to change default in an update, so only do f22+ for now %if 0%{?fedora} > 21 @@ -618,6 +616,9 @@ fi %changelog +* Thu May 14 2015 Rex Dieter 15.04.1-1 +- 15.04.1 + * Fri May 01 2015 Rex Dieter 15.04.0-3 - Added folders to left panel "Places" disappear (#345174) diff --git a/sources b/sources index d0bde23..10e8e0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e5531cb22bc11bb481d0ff75ed3411cf kde-baseapps-15.04.0.tar.xz +3f25cbedfed900f2c5f97cd559b18580 kde-baseapps-15.04.1.tar.xz