From 296537df12fe1771e814afea3739f8e76165638c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 14 Apr 2017 06:55:17 -0500 Subject: [PATCH] pull in upstream fixes, fix URL --- .gitignore | 3 +++ kf5-plasma.spec | 10 ++++++++-- sources | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 290ff12..3c6e3b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /plasma-framework-5.33.0.tar.xz +/0001-if-the-user-did-set-an-implicit-size-keep-it.patch +/0007-Calendar-Use-correct-language-for-month-and-day-name.patch +/0008-Guard-against-Applet-not-loading-AppletInterface.patch diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 503a643..abd96e4 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.33.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: https://cgit.kde.org/?p=plasma-framework.git +URL: https://cgit.kde.org/plasma-framework.git %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -22,6 +22,9 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework} Source10: fedora-plasma-cache.sh.in ## upstream patches (using lookaside cache) +Patch1: 0001-if-the-user-did-set-an-implicit-size-keep-it.patch +Patch7: 0007-Calendar-Use-correct-language-for-month-and-day-name.patch +Patch8: 0008-Guard-against-Applet-not-loading-AppletInterface.patch # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ @@ -166,6 +169,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Fri Apr 14 2017 Rex Dieter - 5.33.0-2 +- pull in upstream fixes, fix URL + * Mon Apr 03 2017 Rex Dieter - 5.33.0-1 - 5.33.0, Requires: qt5-qtquickcontrols qt5-qtquickcontrols2 diff --git a/sources b/sources index b32e92c..3397111 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ SHA512 (plasma-framework-5.33.0.tar.xz) = 18a3c077e354c95e4196e9b693ac942cf462f1de8b3d31fe806374ae4a45d61abfba8d3fdf4abdda3a3b67067995a9de5a7f9a3ec74712d28a5ce72e8519bc71 +SHA512 (0001-if-the-user-did-set-an-implicit-size-keep-it.patch) = 3076ef3b067db0590ad3b9012fd8e14159aa1ee94cc0dfef368c8a411eeba04a1532ce59d9d5c31bcd1a242bf1d101a97cdd4cfbe8ca1a6b647fcf9a1ce14b4f +SHA512 (0007-Calendar-Use-correct-language-for-month-and-day-name.patch) = a329fdfb3a6d6c31c1aa8f39c913932a30f598a01cf28b603125607b9e307f9681ea764dd487d877f4240cb1120e810849dbc5bdb0bcc760638bc4e82f870e1a +SHA512 (0008-Guard-against-Applet-not-loading-AppletInterface.patch) = f19b5e5fa4d3edb60f844cc552bf897695fb4868e8d841fad4ad2d227e231257ced413f796b60f3e48e82f0e74c662d3b98cb834ccd0bc56700b788144092b37