From 57ea023337fa792abcbf1ddf707783bb76752a9d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 20 Jun 2020 08:33:22 -0700 Subject: [PATCH] Revert to 5.18.5-1 state This reverts the 5.18.90 bump and all bumps since then, to get back to the state of the last successful build, 5.18.5-1. The 5.19 bump of Plasma as a whole is currently stuck and untagged from Rawhide. We need to rebuild plasma-workspace for a libgps soname bump, and we can only do that from this state. --- .gitignore | 3 --- plasma-workspace.spec | 21 ++++----------------- sources | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 13c9c23..6be857c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,3 @@ /plasma-workspace-5.18.4.tar.xz /plasma-workspace-5.18.4.1.tar.xz /plasma-workspace-5.18.5.tar.xz -/plasma-workspace-5.18.90.tar.xz -/plasma-workspace-5.19.0.tar.xz -/plasma-workspace-5.19.1.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index b6b44be..5f4c020 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -6,8 +6,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.19.1 -Release: 2%{?dist} +Version: 5.18.5 +Release: 1%{?dist} License: GPLv2+ URL: https://cgit.kde.org/%{name}.git @@ -97,6 +97,7 @@ BuildRequires: qt5-qtbase-devel >= 5.7.0 BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtscript-devel BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtwebkit-devel BuildRequires: phonon-qt5-devel BuildRequires: kf5-rpm-macros >= %{kf5_version_min} @@ -108,6 +109,7 @@ BuildRequires: kf5-kcrash-devel >= %{kf5_version_min} BuildRequires: kf5-kdeclarative-devel >= %{kf5_version_min} BuildRequires: kf5-kdelibs4support-devel >= %{kf5_version_min} BuildRequires: kf5-kdesu-devel >= %{kf5_version_min} +BuildRequires: kf5-kdewebkit-devel >= %{kf5_version_min} BuildRequires: kf5-kdoctools-devel >= %{kf5_version_min} BuildRequires: kf5-kglobalaccel-devel >= %{kf5_version_min} BuildRequires: kf5-kidletime-devel >= %{kf5_version_min} @@ -607,21 +609,6 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog -* Thu Jun 18 2020 Björn Esser - 5.19.1-2 -- Rebuild (gpsd) - -* Wed Jun 17 2020 Martin Kyral - 5.19.1-1 -- 5.19.1 - -* Thu Jun 11 2020 Marie Loise Nolden - 5.19.0-2 -- drop qtwebkit build dependencies - -* Tue Jun 9 2020 Martin Kyral - 5.19.0-1 -- 5.19.0 - -* Fri May 15 2020 Martin Kyral - 5.18.90-1 -- 5.18.90 - * Tue May 05 2020 Jan Grulich - 5.18.5-1 - 5.18.5 diff --git a/sources b/sources index 6496db0..9745aed 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.19.1.tar.xz) = 9e8a8af8bbfae07472363386aec41a76c7ea5d5242ccb376a276d546b819f3d28dd6961630c5e38026256a4ca219bdb1d86fe49eecc572327451b28f3c94e692 +SHA512 (plasma-workspace-5.18.5.tar.xz) = 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2