From 6a5054cee3b44f48c46a0fef167abb4c111e056a4fd793f5888cd16a888e4e3b Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 19 May 2024 09:46:17 +0000 Subject: [PATCH] - Make kcm_trash conflict with kio < 5.116 only (boo#1221438) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras?expand=0&rev=13 --- kio-extras.changes | 5 +++++ kio-extras.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kio-extras.changes b/kio-extras.changes index b2c62d8..c88c5ca 100644 --- a/kio-extras.changes +++ b/kio-extras.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 19 09:46:03 UTC 2024 - Christophe Marin + +- Make kcm_trash conflict with kio < 5.116 only (boo#1221438) + ------------------------------------------------------------------- Tue Apr 9 18:08:18 UTC 2024 - Christophe Marin diff --git a/kio-extras.spec b/kio-extras.spec index 16141a5..7102a0e 100644 --- a/kio-extras.spec +++ b/kio-extras.spec @@ -75,7 +75,7 @@ BuildRequires: pkgconfig(libplist-2.0) BuildRequires: pkgconfig(libtirpc) BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(taglib) -Requires: (trash_kcm or kio-core) +Requires: trash_kcm Requires: qt6-sql-sqlite >= %{qt6_version} Recommends: kf6-kimageformats >= %{kf6_version} Recommends: qt6-imageformats >= %{qt6_version} @@ -92,7 +92,7 @@ Additional KIO-slaves for KDE applications. # kcm_trash.desktop conflicts with KF5's kio one. Only one is needed %package -n trash_kcm Summary: Trash KDE module -Conflicts: kio-core +Conflicts: kio-core < 5.116 %description -n trash_kcm This package provides a configuration module to modify trash settings.