From fa9864934479b76ce565b10e77bd5f8876fe1036 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 8 Dec 2015 18:49:27 -0600
Subject: [PATCH] force plasma's obsolete_kickoffrc.js to run again

---
 fedora-obsolete_kickoffrc-5.5.0-1.sh | 10 ++++++++++
 plasma-desktop.spec                  | 17 ++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100755 fedora-obsolete_kickoffrc-5.5.0-1.sh

diff --git a/fedora-obsolete_kickoffrc-5.5.0-1.sh b/fedora-obsolete_kickoffrc-5.5.0-1.sh
new file mode 100755
index 0000000..80c6365
--- /dev/null
+++ b/fedora-obsolete_kickoffrc-5.5.0-1.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "`kreadconfig5 --file fedora-obsolete_kickoffrc --group 5.5.0-1 --key FirstRun --default true`" = "true" ]; then
+  sed -i \
+  -e 's|=/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/obsolete_kickoffrc.js||g' \
+  -e 's|,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/obsolete_kickoffrc.js||g' \
+  `kf5-config --path config --locate plasmashellrc` && \
+  kwriteconfig5 --file fedora-obsolete_kickoffrc --group 5.5.0-1 --key FirstRun --type bool false
+fi
+
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 174f6ed..50b8b1b 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -4,7 +4,7 @@
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
 Version: 5.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+ and (GPLv2 or GPLv3)
 URL:     https://projects.kde.org/projects/kde/workspace/plasma-desktop
@@ -28,6 +28,8 @@ Patch101: plasma-desktop-5.4.0-default_favorites_f22.patch
 Patch102: plasma-desktop-fedora_layout.patch
 
 ## upstream patches
+# along with patch8, force plasma's obsolete_kickoff.js to run again
+Source8: fedora-obsolete_kickoffrc-5.5.0-1.sh
 Patch8: 0008-Fix-migration-of-multiple-favorites.patch
 
 ## upstreamable patches
@@ -160,7 +162,8 @@ BuildArch: noarch
 %prep
 %setup -q
 
-%patch8 -p1 -b .0008
+# no backups
+%patch8 -p1
 
 %if 0%{?fedora} > 22
 %patch100 -p1 -b .default_favorites
@@ -169,8 +172,8 @@ BuildArch: noarch
 %endif
 %patch102 -p1 -b .fedora_layout
 
-%build
 
+%build
 mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} ..
@@ -195,6 +198,9 @@ cp %{buildroot}%{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop
 # per https://techbase.kde.org/KDE_System_Administration/PlasmaTwoDesktopScripting#Running_Scripts
 mkdir -p %{buildroot}{_datadir}/plasma/shells/org.kde.plasma.desktop/updates/
 
+# force plasma's obsolete_kickoffrc.js to run again (it was broken in initial 5.5.0-1)
+install -m644 -p -D %{SOURCE8} %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/fedora-obsolete_kickoffrc-5.5.0-1.sh
+
 ## unpackaged files
 rm -rfv %{buildroot}%{_datadir}/kdm/pics/users/
 
@@ -219,6 +225,8 @@ fi
 
 %files -f plasmadesktop5.lang
 %license COPYING*
+# hack/workaround for bug #1289709
+%{_sysconfdir}/xdg/plasma-workspace/env/fedora-obsolete_kickoffrc-5.5.0-1.sh
 %if 0%{?fedora} > 20
 %{_bindir}/kapplymousetheme
 %endif
@@ -304,6 +312,9 @@ fi
 %lang(uk) %{_docdir}/HTML/uk/plasma-desktop/
 
 %changelog
+* Tue Dec 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-3
+- force plasma's obsolete_kickoffrc.js to run again
+
 * Tue Dec 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-2
 - backport favorites migration fix (#1289709)