pull in some upstream fixes

epel9
Rex Dieter 3 years ago
parent a7d26d8f7e
commit d2e95ca121

2
.gitignore vendored

@ -68,3 +68,5 @@
/plasma-desktop-5.21.4.tar.xz /plasma-desktop-5.21.4.tar.xz
/plasma-desktop-5.21.5.tar.xz /plasma-desktop-5.21.5.tar.xz
/plasma-desktop-5.21.90.tar.xz /plasma-desktop-5.21.90.tar.xz
/0003-Use-python3-explicitly.patch
/0010-Task-Manager-Optimize-parent-process-CGroup-check.patch

@ -1,23 +1,3 @@
diff --git a/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py b/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
index 56a8d7d..0aec9e3 100755
--- a/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
+++ b/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#
# SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
#
diff --git a/kcms/keyboard/kcminputrc_migrate_repeat_value.py b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
index 6515cff..8016e60 100755
--- a/kcms/keyboard/kcminputrc_migrate_repeat_value.py
+++ b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import sys
for line in sys.stdin:
diff --git a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py diff --git a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
index a019986..cec9c78 100644 index a019986..cec9c78 100644
--- a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py --- a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py

@ -10,7 +10,7 @@
Name: plasma-desktop Name: plasma-desktop
Summary: Plasma Desktop shell Summary: Plasma Desktop shell
Version: 5.21.90 Version: 5.21.90
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and (GPLv2 or GPLv3) License: GPLv2+ and (GPLv2 or GPLv3)
URL: https://invent.kde.org/plasma/%{name} URL: https://invent.kde.org/plasma/%{name}
@ -27,6 +27,8 @@ URL: https://invent.kde.org/plasma/%{name}
Source0: http://download.kde.org/%{stable}/plasma/%{verdir}/%{name}-%{version}.tar.xz Source0: http://download.kde.org/%{stable}/plasma/%{verdir}/%{name}-%{version}.tar.xz
## upstream patches ## upstream patches
Patch3: 0003-Use-python3-explicitly.patch
Patch10: 0010-Task-Manager-Optimize-parent-process-CGroup-check.patch
## downstream patches ## downstream patches
# default kickoff favorites: +konsole +apper # default kickoff favorites: +konsole +apper
@ -203,6 +205,8 @@ BuildArch: noarch
%setup -q %setup -q
## upstream patches ## upstream patches
%patch3 -p1 -b .0003
%patch10 -p1 -b .0010
## upstreamable patches ## upstreamable patches
#patch200 -p1 #patch200 -p1
@ -326,6 +330,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.knetattach.d
%changelog %changelog
* Thu May 20 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.21.90-3
- pull in some upstream fixes
* Sun May 16 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.21.90-2 * Sun May 16 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.21.90-2
- s/kf5-ksysguard/libksysguard/ - s/kf5-ksysguard/libksysguard/

@ -1 +1,3 @@
SHA512 (plasma-desktop-5.21.90.tar.xz) = b43cc534869a350bc701a51803aa745b1914b1200f91706d83fd7f9399dde76c527b3568fd2750ae59ba5a951b1c19ccca8c317ed298ce854fa8c1ad64d557f8 SHA512 (plasma-desktop-5.21.90.tar.xz) = b43cc534869a350bc701a51803aa745b1914b1200f91706d83fd7f9399dde76c527b3568fd2750ae59ba5a951b1c19ccca8c317ed298ce854fa8c1ad64d557f8
SHA512 (0003-Use-python3-explicitly.patch) = 5ba00cc37809d5cefdcc0ba1a87db0287beed7a9406e25117bd66fcb025442b8a894669824bbbf6165e7bfd4274687553e5f7f8a261d05caa689e36ded1e2bc9
SHA512 (0010-Task-Manager-Optimize-parent-process-CGroup-check.patch) = 286dcfaf6006cf50c5b3d35f912728e0dc309418eb3d70d7477897e4230e7ae925adc701af42a049b46da68112a19190fd4aeb7beb7c78bf09d3972d91baa54f

Loading…
Cancel
Save