1
0

Accepting request 961238 from KDE:Frameworks5

KDE Frameworks 5.92 (forwarded request 961114 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/961238
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdelibs4support?expand=0&rev=102
This commit is contained in:
Dominique Leuenberger 2022-03-14 18:34:21 +00:00 committed by Git OBS Bridge
commit c22da6960e
7 changed files with 57 additions and 19 deletions

View File

@ -0,0 +1,28 @@
From efd387e0f0816d0f1fd156f8ba75f4b56dcf5034 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Mon, 7 Mar 2022 14:34:11 +0100
Subject: [PATCH] Don't assume libexec is a LIB_INSTALL_DIR subfolder
FHS 3.0 states that executables not intended to be executed by users shall be under /usr/libexec [1]
[1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html
---
src/kdecore/kstandarddirs.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kdecore/kstandarddirs.cpp b/src/kdecore/kstandarddirs.cpp
index 23064a9a..a61f5ae9 100644
--- a/src/kdecore/kstandarddirs.cpp
+++ b/src/kdecore/kstandarddirs.cpp
@@ -304,7 +304,7 @@ static QString relativeInstallPath(const char *type)
return QFile::decodeName(LIB_INSTALL_DIR "/");
}
if (strcmp("libexec", type) == 0) {
- return QFile::decodeName(LIB_INSTALL_DIR "/libexec/");
+ return QFile::decodeName(LIBEXEC_INSTALL_DIR "/");
}
if (strcmp("locale", type) == 0) {
return QFile::decodeName(LOCALE_INSTALL_DIR "/");
--
2.35.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f6448fc6d03801b8f0e440aecd12e299631ae375c5390b343719eb85374e38c
size 3646812

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmH/kgoACgkQWNDuZIpI
s7sQMAf9ErqCGBqVYXX/WGTt6GkzxzoO8F4axYHJyVZs3bz/mGYiR+O0mIFTYgTj
Xe8i6zSjOJ35PJWkiwQvlzfROEp0kpXLxce2Iuq64Q8q+aRndPOc+c7fv8Ghrv8G
AhkPurMAapo7G5KX3USlJnDwdQhgi+hse0CBNHVJOYpWylyqAqStgLVZ49QmYA4X
pMuKTTAg+DdWsBUw/bYR7eMmDx8Jy3CYT/jYLcur6U1GsA/6b++nEOxtZNtjW4Uj
Vb5UZa6bA3axjwuxQduUkykcb3fZ5Q9c2NVl+gnMcSaa6EhcNgkrDMdnVm4xD1zd
STz3v60siOp+1o1VjFskZVWzp/wyDA==
=sKFq
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0
size 3649060

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmIjwmYACgkQWNDuZIpI
s7vmgQgAnRMAeWnJAFZywU/h2MQi/pOKgkOkzNkn/CkRnjjOixHuePrwElKrTxMf
3HKrdvlljhQPzvTEP6hDUT88vlB5N8+sfPljMvXjcD3gmgV3WSM2/RUYfY3AZlQi
u7XrGHYXSn06arSurxgT80pNnPnYkRY4WnQy2rvIhNfo189mSe3WiBlsfKlqacoi
zMjbShIRel3pHAV19n4JG0U8KKGrXLChiM4oiv6Ve+3cjWxj9HwLcOkEO6g+SejG
5V8NlLbuejIdZLAm8hzSZxUVMfZMhfzbH/KkRzBuHhLspTxk0tg0upcln9gdyug0
dT7rPoKYZszWTEq2SiVKykLnOfdl/g==
=YkeZ
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Mar 7 22:59:09 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 5.92.0
* New feature release
* For more details please see:
* https://kde.org/announcements/frameworks/5/5.92.0
- No code change since 5.91.0
- Add patch:
* 0001-Don-t-assume-libexec-is-a-LIB_INSTALL_DIR-subfolder.patch
-------------------------------------------------------------------
Mon Mar 7 11:58:31 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -17,14 +17,14 @@
%define lname libKF5KDELibs4Support5
%define _tar_path 5.91
%define _tar_path 5.92
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
%bcond_without released
Name: kdelibs4support
Version: 5.91.0
Version: 5.92.0
Release: 0
Summary: Code and utilities to ease the transition to KDE Frameworks 5
License: LGPL-2.1-or-later
@ -37,6 +37,8 @@ Source2: frameworks.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Use-KDE_INSTALL_FULL_-variables-where-needed.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Don-t-assume-libexec-is-a-LIB_INSTALL_DIR-subfolder.patch
BuildRequires: NetworkManager-devel
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
@ -45,7 +47,6 @@ BuildRequires: perl-URI
BuildRequires: pkgconfig
BuildRequires: cmake(KF5Auth) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KDED) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5Bookmarks) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5Completion) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5ConfigWidgets) >= %{_kf5_bugfix_version}
@ -58,7 +59,6 @@ BuildRequires: cmake(KF5GlobalAccel) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5GuiAddons) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5I18n) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5IconThemes) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5ItemViews) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5KIO) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5Notifications) >= %{_kf5_bugfix_version}
BuildRequires: cmake(KF5Parts) >= %{_kf5_bugfix_version}
@ -81,7 +81,6 @@ BuildRequires: cmake(Qt5X11Extras) >= 5.15.0
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
Recommends: %{name}-lang = %{version}
Provides: kde4support = %{version}
Obsoletes: kde4support < %{version}