From b42f303235d0779653296e2feed42e8879ddcf4a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 25 Mar 2016 11:45:53 -0500
Subject: [PATCH] favorites: cleanup, no backups, f22+ fix
 firefox/konsole/discover, f22 fix konq/konsole/discover

---
 plasma-desktop-5.4.0-default_favorites.patch     | 2 +-
 plasma-desktop-5.4.0-default_favorites_f22.patch | 2 +-
 plasma-desktop.spec                              | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plasma-desktop-5.4.0-default_favorites.patch b/plasma-desktop-5.4.0-default_favorites.patch
index bce68f9..b42cfa5 100644
--- a/plasma-desktop-5.4.0-default_favorites.patch
+++ b/plasma-desktop-5.4.0-default_favorites.patch
@@ -7,7 +7,7 @@ index afd0b6f..aa55c49 100644
      </entry>
      <entry name="favorites" type="StringList">
 -      <default>preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
-+      <default>firefox,org.kde.kontact.desktop,kontact.desktop,org.kde.systemsettings.desktop,systemsettings.desktop,org.kde.dolphin.desktop,dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,apper.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
++      <default>firefox.desktop,org.kde.kontact.desktop,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,org.kde.konsole.desktop,apper.desktop,org.kde.discover.desktop</default>
      </entry>
      <entry name="systemApplications" type="StringList">
        <default>systemsettings.desktop</default>
diff --git a/plasma-desktop-5.4.0-default_favorites_f22.patch b/plasma-desktop-5.4.0-default_favorites_f22.patch
index 43ae8f6..cea6f38 100644
--- a/plasma-desktop-5.4.0-default_favorites_f22.patch
+++ b/plasma-desktop-5.4.0-default_favorites_f22.patch
@@ -7,7 +7,7 @@ index afd0b6f..aa55c49 100644
      </entry>
      <entry name="favorites" type="StringList">
 -      <default>preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
-+      <default>preferred://browser,org.kde.kontact.desktop,kontact.desktop,org.kde.systemsettings.desktop,systemsettings.desktop,org.kde.dolphin.desktop,dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,apper.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover</default>
++      <default>konqbrowser.desktop,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,org.kde.konsole.desktop,apper.desktop,org.kde.kate.desktop,org.kde.discover.desktop</default>
      </entry>
      <entry name="systemApplications" type="StringList">
        <default>systemsettings.desktop</default>
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 6acc2ba..c0b7fec 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -4,7 +4,7 @@
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
 Version: 5.5.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+ and (GPLv2 or GPLv3)
 URL:     https://projects.kde.org/plasma-desktop
@@ -172,9 +172,9 @@ BuildArch: noarch
 %patch51 -p1
 
 %if 0%{?fedora} > 22
-%patch100 -p1 -b .default_favorites
+%patch100 -p1
 %else
-%patch101 -p1 -b .default_favorites_f22
+%patch101 -p1
 %endif
 %patch102 -p1 -b .fedora_layout
 
@@ -317,6 +317,9 @@ fi
 
 
 %changelog
+* Fri Mar 25 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.5.5-4
+- favorites: cleanup, no backups, f22+ fix firefox/konsole/discover, f22 fix konq/konsole/discover
+
 * Wed Mar 23 2016 Rex Dieter <rdieter@fedoraproject.org> 5.5.5-3
 - No 'favorites' in F24 KDE menu (#1320395,kde#357029)