rdieter pushed to plasma-desktop (f22). "5.2.2-5 (..more)"

[notifications at fedoraproject.org]

>From 0275bd8506d45885865748ea632b698d7673ad0c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 23 Apr 2015 07:38:48 -0500
Subject: 5.2.2-5

- fix fontinst service paths harder (#1208229)
- Konqueror "favorite" opens as a file manager (#1209169)

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<QString> desktopFiles;
  
diff --git a/plasma-desktop-fix-fontinst-service-path.patch b/plasma-desktop-fix-fontinst-service-path.patch
index 36e471f..a449f1a 100644
--- a/plasma-desktop-fix-fontinst-service-path.patch
+++ b/plasma-desktop-fix-fontinst-service-path.patch
@@ -7,7 +7,7 @@ index f2e6014..b44e8de 100644
  #define __CONFIG_FONTINST_H__
  
 -#define KFONTINST_LIB_EXEC_DIR "@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@"
-+#define KFONTINST_LIB_EXEC_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@"
++#define KFONTINST_LIB_EXEC_DIR "@KAUTH_HELPER_INSTALL_DIR@"
  
  /* Define to 1 if you have the <locale.h> header file. */
  #cmakedefine HAVE_LOCALE_H 1
@@ -19,7 +19,7 @@ index e212a88..a2915b5 100644
  [D-BUS Service]
  Name=org.kde.fontinst
 -Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst
-+Exec=@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@/fontinst
++Exec=@KAUTH_HELPER_INSTALL_DIR@/fontinst
  
 diff --git a/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake b/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
 index be6927f..c8b540f 100644
@@ -29,6 +29,6 @@ index be6927f..c8b540f 100644
  [D-BUS Service]
  Name=org.kde.fontinst
 -Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst
-+Exec=@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@/fontinst
++Exec=@KAUTH_HELPER_INSTALL_DIR/fontinst
  User=root
  
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 6de15e9..7fcb615 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -1,6 +1,6 @@
 Name:           plasma-desktop
 Version:        5.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plasma Desktop shell
 
 License:        GPLv2+ and (GPLv2 or GPLv3)
@@ -15,7 +15,7 @@ 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
@@ -222,6 +222,10 @@ fi
 
 
 %changelog
+* Thu Apr 23 2015 Rex Dieter <rdieter at fedoraproject.org> - 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 <dvratil at redhat.com> 5.2.2-4
 - fix fontinst service paths (rhbz#1208229)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-desktop.git/commit/?h=f22&id=0275bd8506d45885865748ea632b698d7673ad0c