From 64bcce9b347aaed58fb7c035f7e87cbb3867f1ce Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Mon, 16 Oct 2023 10:26:17 +0200 Subject: [PATCH] Actually remove kwallet-query from the compat build -DBUILD_KWALLETD=OFF still produces kwallet-query, but it conflicts with the KF6 counterpart --- kf5-kwallet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kwallet.spec b/kf5-kwallet.spec index c2fe4fc..0a5b446 100644 --- a/kf5-kwallet.spec +++ b/kf5-kwallet.spec @@ -93,6 +93,9 @@ developing applications that use %{name}. %install %cmake_install +%if %{with kf6_compat} +rm %{buildroot}%{_mandir}/man1/kwallet-query.1* %{buildroot}%{_kf5_bindir}/kwallet-query +%endif %find_lang %{name} --all-name --with-man @@ -115,8 +118,8 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||: %{_kf5_datadir}/kservices5/kwalletd5.desktop %{_kf5_datadir}/applications/org.kde.kwalletd5.desktop %{_kf5_datadir}/knotifications5/kwalletd5.notifyrc -%endif %{_mandir}/man1/kwallet-query.1* +%endif %ldconfig_scriptlets libs