diff --git a/0001-fix-package-listing.patch b/0001-fix-package-listing.patch deleted file mode 100644 index 1991423..0000000 --- a/0001-fix-package-listing.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 60fe4f080c514fb3d5c6a8f61e5f4333700a8c82 Mon Sep 17 00:00:00 2001 -From: Marco Martin -Date: Fri, 28 Aug 2015 16:48:05 +0200 -Subject: [PATCH] fix package listing - -load a package of the proper type before listing -this makes the proper package structures to be loaded ---- - src/plasmapkg/plasmapkg.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/plasmapkg/plasmapkg.cpp b/src/plasmapkg/plasmapkg.cpp -index cea331c..4626323 100644 ---- a/src/plasmapkg/plasmapkg.cpp -+++ b/src/plasmapkg/plasmapkg.cpp -@@ -436,6 +436,10 @@ QStringList PlasmaPkgPrivate::packages(const QStringList &types) - } - } - -+ //Loading a package of the given type, caches the proper -+ //packagestructures in the packageloader, making the listing -+ //of packages succeed -+ Plasma::PluginLoader::self()->loadPackage(type); - const QList plugins = KPackage::PackageLoader::self()->listPackages(type); - for (auto plugin : plugins) { - const QString _plugin = plugin.pluginId(); --- -2.4.3 - diff --git a/fedora-plasma-cache.sh.in b/fedora-plasma-cache.sh.in new file mode 100644 index 0000000..d64ac5e --- /dev/null +++ b/fedora-plasma-cache.sh.in @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ "`kreadconfig5 --file fedora-plasma-cacherc --group @@VERSION@@ --key FirstRun --default true`" = "true" ]; then + rm -fv "${XDG_CACHE_HOME:-${HOME}/.cache}"/{*.kcache,plasma-svgelements-*} + kwriteconfig5 --file fedora-plasma-cacherc --group @@VERSION@@ --key FirstRun --type bool false +fi diff --git a/kf5-plasma-r124371.patch b/kf5-plasma-r124371.patch deleted file mode 100644 index 44d1c72..0000000 --- a/kf5-plasma-r124371.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/platformstatus/platformstatus.cpp b/src/platformstatus/platformstatus.cpp -index e03c16d..7e70d97 100644 ---- a/src/platformstatus/platformstatus.cpp -+++ b/src/platformstatus/platformstatus.cpp -@@ -87,7 +87,7 @@ void PlatformStatus::findLookAndFeelPackage(bool sendSignal) - QStandardPaths::LocateDirectory); - if (path.isEmpty()) { - if (package != defaultPackage) { -- group.deleteEntry("LookAndFeel"); -+ group.deleteEntry("LookAndFeelPackage"); - findLookAndFeelPackage(sendSignal); - } - diff --git a/kf5-plasma.spec b/kf5-plasma.spec index abf8dd7..b80fc7d 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -1,12 +1,12 @@ %global framework plasma -Name: kf5-%{framework} -Version: 5.16.0 -Release: 1%{?dist} -Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface +Name: kf5-%{framework} +Version: 5.16.0 +Release: 2%{?dist} +Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface -License: GPLv2+ and LGPLv2+ and BSD -URL: https://projects.kde.org/projects/frameworks/plasma-framework +License: GPLv2+ and LGPLv2+ and BSD +URL: https://projects.kde.org/projects/frameworks/plasma-framework %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -15,67 +15,70 @@ URL: https://projects.kde.org/projects/frameworks/plasma-framework %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-framework-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-framework-%{version}.tar.xz -## upstream patches - -BuildRequires: libX11-devel -BuildRequires: libxcb-devel -BuildRequires: libXrender-devel -BuildRequires: libXScrnSaver-devel -BuildRequires: libXext-devel -BuildRequires: libSM-devel -BuildRequires: openssl-devel -BuildRequires: libGL-devel +# hackish cache invalidation +Source10: fedora-plasma-cache.sh.in -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: qt5-qtdeclarative-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qtscript-devel +## upstream patches -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-kactivities-devel >= %{version} +BuildRequires: kf5-kactivities-devel >= %{version} BuildRequires: kf5-karchive-devel >= %{version} +BuildRequires: kf5-karchive-devel >= %{version} +BuildRequires: kf5-kconfig-devel >= %{version} BuildRequires: kf5-kconfig-devel >= %{version} BuildRequires: kf5-kconfigwidgets-devel >= %{version} +BuildRequires: kf5-kconfigwidgets-devel >= %{version} BuildRequires: kf5-kcoreaddons-devel >= %{version} +BuildRequires: kf5-kcoreaddons-devel >= %{version} +BuildRequires: kf5-kdbusaddons-devel >= %{version} BuildRequires: kf5-kdbusaddons-devel >= %{version} BuildRequires: kf5-kdeclarative-devel >= %{version} +BuildRequires: kf5-kdeclarative-devel >= %{version} BuildRequires: kf5-kdesu-devel >= %{version} BuildRequires: kf5-kdoctools-devel >= %{version} +BuildRequires: kf5-kdoctools-devel >= %{version} BuildRequires: kf5-kglobalaccel-devel >= %{version} +BuildRequires: kf5-kglobalaccel-devel >= %{version} +BuildRequires: kf5-kguiaddons-devel >= %{version} BuildRequires: kf5-kguiaddons-devel >= %{version} BuildRequires: kf5-ki18n-devel >= %{version} +BuildRequires: kf5-ki18n-devel >= %{version} +BuildRequires: kf5-kiconthemes-devel >= %{version} BuildRequires: kf5-kiconthemes-devel >= %{version} BuildRequires: kf5-kio-devel >= %{version} +BuildRequires: kf5-kio-devel >= %{version} BuildRequires: kf5-knotifications-devel >= %{version} +BuildRequires: kf5-knotifications-devel >= %{version} +BuildRequires: kf5-kpackage-devel >= %{version} BuildRequires: kf5-kpackage-devel >= %{version} BuildRequires: kf5-kparts-devel >= %{version} BuildRequires: kf5-kservice-devel >= %{version} +BuildRequires: kf5-kservice-devel >= %{version} BuildRequires: kf5-kwidgetsaddons-devel >= %{version} BuildRequires: kf5-kwindowsystem-devel >= %{version} -BuildRequires: kf5-kxmlgui-devel >= %{version} -BuildRequires: kf5-solid-devel >= %{version} -BuildRequires: kf5-kiconthemes-devel >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kactivities-devel >= %{version} -BuildRequires: kf5-kservice-devel >= %{version} -BuildRequires: kf5-kio-devel >= %{version} -BuildRequires: kf5-kcoreaddons-devel >= %{version} -BuildRequires: kf5-knotifications-devel >= %{version} -BuildRequires: kf5-kdbusaddons-devel >= %{version} -BuildRequires: kf5-kguiaddons-devel >= %{version} BuildRequires: kf5-kwindowsystem-devel >= %{version} -BuildRequires: kf5-kconfigwidgets-devel >= %{version} -BuildRequires: kf5-ki18n-devel >= %{version} -BuildRequires: kf5-kdeclarative-devel >= %{version} BuildRequires: kf5-kxmlgui-devel >= %{version} -BuildRequires: kf5-kpackage-devel >= %{version} -BuildRequires: kf5-kglobalaccel-devel >= %{version} -BuildRequires: kf5-kdoctools-devel >= %{version} -BuildRequires: kf5-karchive-devel >= %{version} +BuildRequires: kf5-kxmlgui-devel >= %{version} +BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: kf5-solid-devel >= %{version} +BuildRequires: libGL-devel +BuildRequires: libSM-devel +BuildRequires: libX11-devel +BuildRequires: libxcb-devel +BuildRequires: libXext-devel +BuildRequires: libXrender-devel +BuildRequires: libXScrnSaver-devel +BuildRequires: openssl-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtscript-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qtx11extras-devel + Requires: kf5-filesystem >= %{version} @@ -87,7 +90,6 @@ Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: kf5-kpackage-devel >= %{version} Requires: kf5-kservice-devel >= %{version} - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -96,6 +98,7 @@ developing applications that use %{name}. %prep %autosetup -n %{framework}-framework-%{version} -p1 +install -m644 -p %{SOURCE10} . %build mkdir %{_target_platform} @@ -110,12 +113,18 @@ make %{?_smp_mflags} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %find_lang plasma5_qt --with-qt --all-name +mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env +sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ + %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/fedora-plasma-cache.sh + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f plasma5_qt.lang -%doc COPYING.LIB README.md +%doc README.md +%license COPYING.LIB +%{_sysconfdir}/xdg/plasma-workspace/env/fedora-plasma-cache.sh %{_kf5_bindir}/plasmapkg2 %{_kf5_libdir}/libKF5Plasma.so.* %{_kf5_libdir}/libKF5PlasmaQuick.so.* @@ -132,7 +141,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_mandir}/man1/plasmapkg2.1* %{_kf5_plugindir}/kded/platformstatus.so -%lang(lt) %{_datadir}/locale/lt/LC_SCRIPTS/libplasma5/*.js +%lang(lt) %{_datadir}/locale/lt/LC_SCRIPTS/libplasma5/ %files devel %{_kf5_libdir}/cmake/KF5Plasma/ @@ -145,6 +154,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Nov 19 2015 Rex Dieter - 5.16.0-2 +- .spec cosmetics, use %%license +- add env script invalidate plasma cache on version upgrades + * Sun Nov 08 2015 Daniel Vrátil - 5.16.0-1 - KDE Frameworks 5.16.0