diff --git a/kf5-plasma-r124371.patch b/kf5-plasma-r124371.patch new file mode 100644 index 0000000..44d1c72 --- /dev/null +++ b/kf5-plasma-r124371.patch @@ -0,0 +1,13 @@ +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 1de95d2..55354d7 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.12.0 -Release: 1%{?dist} +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: http://www.kde.org +URL: https://projects.kde.org/projects/frameworks/plasma-framework %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -18,8 +18,8 @@ URL: http://www.kde.org Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-framework-%{version}.tar.xz ## upstream patches -# needed by patch12, to apply binary git patch -BuildRequires: git-core +# https://git.reviewboard.kde.org/r/124371 +Patch1: kf5-plasma-r124371.patch BuildRequires: libX11-devel BuildRequires: libxcb-devel @@ -37,29 +37,29 @@ BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtscript-devel BuildRequires: kf5-rpm-macros -BuildRequires: extra-cmake-modules -BuildRequires: kf5-kactivities-devel -BuildRequires: kf5-karchive-devel -BuildRequires: kf5-kconfigwidgets-devel -BuildRequires: kf5-kcoreaddons-devel -BuildRequires: kf5-kdbusaddons-devel -BuildRequires: kf5-kdeclarative-devel -BuildRequires: kf5-kglobalaccel-devel -BuildRequires: kf5-kguiaddons-devel -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kiconthemes-devel -BuildRequires: kf5-kio-devel -BuildRequires: kf5-kservice-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: kf5-kxmlgui-devel -BuildRequires: kf5-kdoctools-devel -BuildRequires: kf5-kpackage-devel +BuildRequires: extra-cmake-modules >= %{version} +BuildRequires: kf5-kactivities-devel >= %{version} +BuildRequires: kf5-karchive-devel >= %{version} +BuildRequires: kf5-kconfig-devel >= %{version} +BuildRequires: kf5-kconfigwidgets-devel >= %{version} +BuildRequires: kf5-kcoreaddons-devel >= %{version} +BuildRequires: kf5-kdbusaddons-devel >= %{version} +BuildRequires: kf5-kdeclarative-devel >= %{version} BuildRequires: kf5-kdesu-devel +BuildRequires: kf5-kdoctools-devel >= %{version} +BuildRequires: kf5-kglobalaccel-devel >= %{version} +BuildRequires: kf5-kguiaddons-devel >= %{version} +BuildRequires: kf5-ki18n-devel >= %{version} +BuildRequires: kf5-kiconthemes-devel >= %{version} +BuildRequires: kf5-kio-devel >= %{version} +BuildRequires: kf5-knotifications-devel >= %{version} +BuildRequires: kf5-kpackage-devel >= %{version} +BuildRequires: kf5-kparts-devel +BuildRequires: kf5-kservice-devel >= %{version} BuildRequires: kf5-kwidgetsaddons-devel -BuildRequires: kf5-knotifications-devel +BuildRequires: kf5-kwindowsystem-devel >= %{version} +BuildRequires: kf5-kxmlgui-devel >= %{version} BuildRequires: kf5-solid-devel -BuildRequires: kf5-kparts-devel -BuildRequires: kf5-kconfig-devel Requires: kf5-filesystem @@ -79,7 +79,7 @@ developing applications that use %{name}. %prep -%autosetup -n %{framework}-framework-%{version} -Sgit +%autosetup -n %{framework}-framework-%{version} -p1 %build @@ -105,23 +105,24 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_libdir}/libKF5Plasma.so.* %{_kf5_libdir}/libKF5PlasmaQuick.so.* %{_kf5_qmldir}/org/kde/* -%{_kf5_qmldir}/QtQuick/Controls/Styles/Plasma +%dir %{_kf5_qmldir}/QtQuick/Controls/ +%dir %{_kf5_qmldir}/QtQuick/Controls/Styles/ +%{_kf5_qmldir}/QtQuick/Controls/Styles/Plasma/ %{_kf5_qtplugindir}/*.so %{_kf5_qtplugindir}/plasma/ -%{_kf5_qtplugindir}/plasma/scriptengines/ %{_kf5_datadir}/dbus-1/interfaces/*.xml %{_kf5_datadir}/plasma/ %{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservices5/kded/*.desktop %{_kf5_datadir}/kservicetypes5/*.desktop -%{_kf5_mandir}/man1/plasmapkg2.1.gz +%{_kf5_mandir}/man1/plasmapkg2.1* %{_kf5_plugindir}/kded/platformstatus.so %lang(lt) %{_datadir}/locale/lt/LC_SCRIPTS/libplasma5/*.js %files devel -%{_kf5_libdir}/cmake/KF5Plasma -%{_kf5_libdir}/cmake/KF5PlasmaQuick +%{_kf5_libdir}/cmake/KF5Plasma/ +%{_kf5_libdir}/cmake/KF5PlasmaQuick/ %{_kf5_libdir}/libKF5Plasma.so %{_kf5_libdir}/libKF5PlasmaQuick.so %{_kf5_includedir}/plasma_version.h @@ -130,6 +131,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Jul 16 2015 Rex Dieter - 5.12.0-2 +- pull in proposed fix for renamed LookAndFeelPackage (review#124371) +- bump/sort build deps +- update URL +- polish dir ownership + * Fri Jul 10 2015 Rex Dieter - 5.12.0-1 - 5.12.0