omit env hack, rename plasma update script instead

epel9
Rex Dieter 9 years ago
parent fa98649344
commit 8c50f18010

@ -1,10 +0,0 @@
#!/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

@ -4,7 +4,7 @@
Name: plasma-desktop
Summary: Plasma Desktop shell
Version: 5.5.0
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+ and (GPLv2 or GPLv3)
URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop
@ -29,7 +29,6 @@ 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
@ -194,12 +193,9 @@ mkdir -p %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/servic
cp %{buildroot}%{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop \
%{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services
# create own `kf5-config --path data`/plasma/shells/org.kde.plasma.desktop/updates/
# 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
# rename script to force it to run again (initial 5.5.0 version was buggy)
mv %{buildroot}{_datadir}/plasma/shells/org.kde.plasma.desktop/updates/obsolete_kickoffrc.js \
%{buildroot}{_datadir}/plasma/shells/org.kde.plasma.desktop/updates/obsolete_kickoffrc-1.js
## unpackaged files
rm -rfv %{buildroot}%{_datadir}/kdm/pics/users/
@ -225,8 +221,6 @@ 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
@ -311,7 +305,11 @@ fi
%lang(sv) %{_docdir}/HTML/sv/plasma-desktop/
%lang(uk) %{_docdir}/HTML/uk/plasma-desktop/
%changelog
* Wed Dec 09 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-4
- omit env hack, rename plasma update script instead
* Tue Dec 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-3
- force plasma's obsolete_kickoffrc.js to run again

Loading…
Cancel
Save