diff --git a/0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch b/0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch deleted file mode 100644 index 05d3917..0000000 --- a/0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch +++ /dev/null @@ -1,48 +0,0 @@ -From da706d27bb4663e584725926ed144b6089bc6c3e Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 8 Feb 2022 18:55:49 +0100 -Subject: [PATCH 1/2] Search in /usr/local/sbin:/usr/sbin:/sbin as fallback - -Utilities such as lspci default to /usr/(local/)sbin/ as install location, -but that's not in $PATH for regular user sessions. It still works without -supeuser privileges, so just look there as well as a fallback. - -BUG: 449792 ---- - src/CommandOutputContext.cpp | 6 ++++++ - src/CommandOutputContext.h | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/CommandOutputContext.cpp b/src/CommandOutputContext.cpp -index 4808b45..ec3cd3d 100644 ---- a/src/CommandOutputContext.cpp -+++ b/src/CommandOutputContext.cpp -@@ -19,6 +19,12 @@ CommandOutputContext::CommandOutputContext(const QString &executable, const QStr - , m_executablePath(QStandardPaths::findExecutable(m_executableName)) - , m_arguments(arguments) - { -+ // Various utilities are installed in sbin, but work without elevated privileges -+ if (m_executablePath.isEmpty()) { -+ m_executablePath = -+ QStandardPaths::findExecutable(m_executableName, {QStringLiteral("/usr/local/sbin"), QStringLiteral("/usr/sbin"), QStringLiteral("/sbin")}); -+ } -+ - metaObject()->invokeMethod(this, &CommandOutputContext::load); - } - -diff --git a/src/CommandOutputContext.h b/src/CommandOutputContext.h -index 13fc528..c818b42 100644 ---- a/src/CommandOutputContext.h -+++ b/src/CommandOutputContext.h -@@ -44,7 +44,7 @@ private: - void setReady(); - - const QString m_executableName; -- const QString m_executablePath; -+ QString m_executablePath; - const QStringList m_arguments; - - QStringList m_originalLines; --- -2.33.1 - diff --git a/kinfocenter-5.24.0.tar.xz b/kinfocenter-5.24.0.tar.xz deleted file mode 100644 index 9cc53bb..0000000 --- a/kinfocenter-5.24.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce1aeb35dff21642d622687c8dcb0d51ad1520d1e8dee443bc1780417032d825 -size 716592 diff --git a/kinfocenter-5.24.0.tar.xz.sig b/kinfocenter-5.24.0.tar.xz.sig deleted file mode 100644 index 22efb4e..0000000 --- a/kinfocenter-5.24.0.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmH75ykACgkQ11dEg7tX -sY0MURAAnN6hYt1qdt/iqLTrRLJeL3ilfI6nvkRBv0H3QEPolqYydNz0G/j6Kv9u -IppeZuB++0q4ywygGYQwwsBc/OBHEp6FFsMVmrsJuWr1KwhYilcq+yb1CVd+8wLl -Wky16cZdJFrC7ha1fZK30vAKvNwSrom9PR6uSXLOefbJYroLkVhCEJr5zItXRfoL -7Re7J42b2gtfEX9mKu47oA0uijiMzSHAj+SG0m+iiSmr+pLzqJljpmybXl9LRGc3 -CzHJ/QlcRyb6GOwBvMIPGMK0j63Z8cHHmMe/Erz2F9ILGrhGsvGuyuN1jf2dlFqw -izpwvwvodYMzakExwrqYMmqtB4r4eor4PNM7t5oQVoNWUnfjIE+jg4EzZFFnIxMO -5EsEL3XSxAleIYH00egFU0QXiWefJ3KnCTModIAfWeHF31tA+eGKSKfo1t5UczK4 -aUw8F9EvuNniA+cTKByB63gSep9L5YKtxS9/vQXcRs5C2bB3bZWNTkUluSjdRxvw -VH4oghRW4mfpi6bg4daKW7zmGNBs31j5RWytRhVpd4Mltiu/7uSw3Nh+8XoKxxes -OFJ4KxfVWz60hq++crlhN2lKs0jDEJV5ZC798jV3KYGTYXzJub3/g0kIDtYJXQir -VRyqL0/f9CWgqCOVmYbOZLMjpV6qInwt8vkmXB7CEbIqZTi40p0= -=jR0u ------END PGP SIGNATURE----- diff --git a/kinfocenter-5.24.1.tar.xz b/kinfocenter-5.24.1.tar.xz new file mode 100644 index 0000000..03be0f3 --- /dev/null +++ b/kinfocenter-5.24.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7959e24d98707cba2403caa68db3a6b20c23d6e5122e903233caf0656ce600c5 +size 717280 diff --git a/kinfocenter-5.24.1.tar.xz.sig b/kinfocenter-5.24.1.tar.xz.sig new file mode 100644 index 0000000..1b907fb --- /dev/null +++ b/kinfocenter-5.24.1.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmILnBsACgkQ11dEg7tX +sY2Taw//TJF5EZGCEDiS9P/r9Zj6n30rG2fqJM6rD1ajcxN6NlvmIIEjU2Dq7Los +OUJPtFona4Vuyu4PpRXA9XzE0Fr1/RaWb8GHQPwLTFAxo+vE5ut7O5iX/233MaN0 +lk6UBETZ8M5T4TniRY67F4RoeGo+22B5ERCyCPXxpY5k9Tk3ctMkvEPLYTkeYz0D +KF8jPoxP55xHUkuv5UxVQjk0FUjBe8LqX35pl59cg+nTM9SNtfMRHcNe/6OSRFQz +queMZcQR/XVXzt0M/WqJw66c3vspFVVB+bEq0tM2yAQ+vnRRH7dHM/yO3XiXPPD6 +lVVVgI1AAnWc/pSxJZ9RPHZPXiqKkv92OdAKUJeVtXKePIjoad5rORAGEvacdQox +kp2KIkhCYIqVArThc8EusHfcmTlKuaUxMKVcnC4Nkwkzl0UPvSR1x/3yut8/aLAf +ZiYHMutIb54MqJiURv+YLszweGDOTVGLgxsf0+2hXqLtMd9jLLR1L24I+cbmRj7a +Xe/U3ZjAleF4McPf2/F4/jvgIwL+GwChRIDcCUm1N5W6UBCKqVPSUQlAedkH7dt/ +Hfeg7RlR52Fkyu5uDJa9RSohAFyRSC/wQox21h+lAIgHdIP4dSBYCKUeOhO4dZwO +UsEtmhweMM2XE47D4Gmh9at469NhCOFju/onUdMbDCBhsuIZa9Q= +=Ikj5 +-----END PGP SIGNATURE----- diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 337c142..c3fa70d 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Feb 15 19:18:15 UTC 2022 - Fabian Vogt + +- Update to 5.24.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.24.1 +- Changes since 5.24.0: + * Search in /usr/local/sbin:/usr/sbin:/sbin as fallback (kde#449792) +- Drop patches, now upstream + * 0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch + ------------------------------------------------------------------- Wed Feb 9 16:09:01 UTC 2022 - Fabian Vogt diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 6a57052..1e7b8df 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -23,7 +23,7 @@ %bcond_without released Name: kinfocenter5 -Version: 5.24.0 +Version: 5.24.1 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -33,13 +33,11 @@ Summary: Utility that provides information about a computer system License: GPL-2.0-or-later Group: System/GUI/KDE URL: http://www.kde.org/ -Source: kinfocenter-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/%{version}/kinfocenter-%{version}.tar.xz %if %{with released} -Source1: kinfocenter-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/plasma/%{version}/kinfocenter-%{version}.tar.xz.sig Source2: plasma.keyring %endif -# PATCH-FIX-UPSTREAM -Patch1: 0001-Search-in-usr-local-sbin-usr-sbin-sbin-as-fallback.patch # PATCH-FIX-OPENSUSE Patch100: 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch BuildRequires: extra-cmake-modules >= %{kf5_version}