diff --git a/.gitignore b/.gitignore index 7189d92..a309976 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ /plasma-desktop-5.2.0.tar.xz /plasma-desktop-5.2.1.tar.xz /plasma-desktop-5.2.2.tar.xz -/plasma-desktop-5.2.95.tar.xz diff --git a/plasma-desktop-5.2.1-default_favorites.patch b/plasma-desktop-5.2.1-default_favorites.patch index d468a22..f526841 100644 --- a/plasma-desktop-5.2.1-default_favorites.patch +++ b/plasma-desktop-5.2.1-default_favorites.patch @@ -6,7 +6,7 @@ diff -up plasma-desktop-5.2.1/applets/kickoff/core/favoritesmodel.cpp.default_fa } - applications << browser << "kontact" << "systemsettings" << "dolphin" << "ktp-contactlist" << "kate"; -+ applications << browser << "kontact" << "systemsettings" << "dolphin" << "ktp-contactlist" << "kate" << "org.kde.konsole" << "apper"; ++ applications << "konqbrowser" << "kontact" << "systemsettings" << "dolphin" << "ktp-contactlist" << "kate" << "org.kde.konsole" << "apper"; QList desktopFiles; diff --git a/plasma-desktop.spec b/plasma-desktop.spec index d8ceef6..7fcb615 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,6 +1,6 @@ Name: plasma-desktop -Version: 5.2.95 -Release: 1%{?dist} +Version: 5.2.2 +Release: 5%{?dist} Summary: Plasma Desktop shell License: GPLv2+ and (GPLv2 or GPLv3) @@ -15,10 +15,11 @@ URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz ## downstream patches -# adjust default kickoff favorites: +konsole +apper +# adjust default kickoff favorites: -preferred_browser(buggy) +konqueror +konsole +apper Patch100: plasma-desktop-5.2.1-default_favorites.patch ## upstream patches +Patch200: plasma-desktop-fix-fontinst-service-path.patch BuildRequires: libusb-devel BuildRequires: fontconfig-devel @@ -57,8 +58,6 @@ BuildRequires: kf5-kwallet-devel BuildRequires: kf5-krunner-devel BuildRequires: kf5-ksysguard-devel BuildRequires: kf5-baloo-devel -BuildRequires: kf5-kdeclarative-devel -BuildRequires: kf5-kpeople-devel BuildRequires: plasma-workspace-devel BuildRequires: kwin-devel @@ -223,8 +222,9 @@ fi %changelog -* Wed Apr 22 2015 Daniel Vrátil - 5.2.95-1 -- Plasma 5.2.95 +* Thu Apr 23 2015 Rex Dieter - 5.2.2-5 +- fix fontinst service paths harder (#1208229) +- Konqueror "favorite" opens as a file manager (#1209169) * Thu Apr 02 2015 Daniel Vrátil 5.2.2-4 - fix fontinst service paths (rhbz#1208229) diff --git a/sources b/sources index b228acf..1ff3c2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0117ad0616bc39b7ef9a43c23580f96f plasma-desktop-5.2.95.tar.xz +dc5e656b26d31bda9d0504b3df2a5b18 plasma-desktop-5.2.2.tar.xz