dvratil pushed to plasma-desktop (master). "Plasma 5.2.95"

Thu Apr 23 16:49:30 UTC 2015

>From 9f69dedca018cfa9455ffda2ef274239e250f983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Thu, 23 Apr 2015 18:49:07 +0200
Subject: Plasma 5.2.95

diff --git a/.gitignore b/.gitignore
index a309976..7189d92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /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-fix-fontinst-service-path.patch b/plasma-desktop-fix-fontinst-service-path.patch
deleted file mode 100644
index a449f1a..0000000
--- a/plasma-desktop-fix-fontinst-service-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/kcms/kfontinst/config-fontinst.h.cmake b/kcms/kfontinst/config-fontinst.h.cmake
-index f2e6014..b44e8de 100644
---- a/kcms/kfontinst/config-fontinst.h.cmake
-+++ b/kcms/kfontinst/config-fontinst.h.cmake
-@@ -1,7 +1,7 @@
- #ifndef __CONFIG_FONTINST_H__
- #define __CONFIG_FONTINST_H__
- 
--#define KFONTINST_LIB_EXEC_DIR "@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_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
-diff --git a/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake b/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
-index e212a88..a2915b5 100644
---- a/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
-+++ b/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=org.kde.fontinst
--Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_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
---- a/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
-+++ b/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
-@@ -1,5 +1,5 @@
- [D-BUS Service]
- Name=org.kde.fontinst
--Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst
-+Exec=@KAUTH_HELPER_INSTALL_DIR/fontinst
- User=root
- 
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 7fcb615..1b8b5a1 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -1,6 +1,6 @@
 Name:           plasma-desktop
-Version:        5.2.2
-Release:        5%{?dist}
+Version:        5.2.95
+Release:        1%{?dist}
 Summary:        Plasma Desktop shell
 
 License:        GPLv2+ and (GPLv2 or GPLv3)
@@ -19,7 +19,6 @@ Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve
 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
@@ -58,6 +57,8 @@ 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
@@ -177,25 +178,30 @@ fi
 %{_kf5_libdir}/libkdeinit5_kaccess.so
 %{_kf5_libdir}/kconf_update_bin/*
 # TODO: -libs subpkg -- rex
-%{_libdir}/libkfontinst.so.*
-%{_libdir}/libkfontinstui.so.*
+%{_kf5_libdir}/libkfontinst.so.*
+%{_kf5_libdir}/libkfontinstui.so.*
+%{_kf5_libdir}/libKF5ActivitiesExperimentalStats.so.*
 %{_kf5_qtplugindir}/*.so
-%{_datadir}/plasma/*
-%{_datadir}/kcminput
-%{_datadir}/color-schemes
-%{_datadir}/kconf_update/*
-%{_datadir}/kdisplay
-%{_datadir}/kcontrol
-%{_datadir}/kcmkeys
-%{_datadir}/kcm_componentchooser
-%{_datadir}/kcm_phonon
-%{_datadir}/kfontinst
-%{_datadir}/kcmkeyboard
-%{_datadir}/ksmserver
+%{_kf5_qtplugindir}/kcms/*.so
+%{_kf5_qmldir}/org/kde/plasma/activityswitcher
+%{_kf5_qmldir}/org/kde/private/desktopcontainment/*
+%{_kf5_datadir}/plasma/*
+%{_kf5_datadir}/kcminput
+%{_kf5_datadir}/color-schemes
+%{_kf5_datadir}/kconf_update/*
+%{_kf5_datadir}/kdisplay
+%{_kf5_datadir}/kcontrol
+%{_kf5_datadir}/kcmkeys
+%{_kf5_datadir}/kcm_componentchooser
+%{_kf5_datadir}/kcm_phonon
+%{_kf5_datadir}/kfontinst
+%{_kf5_datadir}/kcmkeyboard
+%{_kf5_datadir}/ksmserver
+%{_kf5_datadir}/kpackage/kcms/*
 %{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop
 %{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{_datadir}/kcmsolidactions
-%{_datadir}/solid/devices/*.desktop
+%{_kf5_datadir}/kcmsolidactions
+%{_kf5_datadir}/solid/devices/*.desktop
 %config %{_sysconfdir}/dbus-1/system.d/*.conf
 %config %{_sysconfdir}/xdg/*.knsrc
 %{_kf5_datadir}/kservices5/*.desktop
@@ -222,6 +228,9 @@ fi
 
 
 %changelog
+* Thu Apr 23 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.95-1
+- Plasma 5.2.95
+
 * 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)
diff --git a/sources b/sources
index 1ff3c2f..b228acf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc5e656b26d31bda9d0504b3df2a5b18  plasma-desktop-5.2.2.tar.xz
+0117ad0616bc39b7ef9a43c23580f96f  plasma-desktop-5.2.95.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-desktop.git/commit/?h=master&id=9f69dedca018cfa9455ffda2ef274239e250f983
