5.115.0

-DBUILD_KWALLETD=OFF still produces kwallet-query, but it conflicts
with the KF6 counterpart

.gitignore

@@ -46,3 +46,20 @@
 ./kwallet-5.93.tar.xz
 /kwallet-5.94.0.tar.xz
 /kwallet-5.96.0.tar.xz
+/kwallet-5.97.0.tar.xz
+/kwallet-5.98.0.tar.xz
+/kwallet-5.99.0.tar.xz
+/kwallet-5.100.0.tar.xz
+/kwallet-5.101.0.tar.xz
+/kwallet-5.102.0.tar.xz
+/kwallet-5.103.0.tar.xz
+/kwallet-5.104.0.tar.xz
+/kwallet-5.105.0.tar.xz
+/kwallet-5.106.0.tar.xz
+/kwallet-5.107.0.tar.xz
+/kwallet-5.108.0.tar.xz
+/kwallet-5.109.0.tar.xz
+/kwallet-5.110.0.tar.xz
+/kwallet-5.111.0.tar.xz
+/kwallet-5.113.0.tar.xz
+/kwallet-5.115.0.tar.xz

kf5-kwallet.spec

@@ -1,3 +1,5 @@
+%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
+
 %undefine __cmake_in_source_build
 %global framework kwallet
 
@@ -9,28 +11,29 @@
 %endif
 
 Name:    kf5-%{framework}
-Version: 5.96.0
+Version: 5.115.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 3 solution for password management
 
-License: LGPLv2+
+License: BSD-3-Clause AND CC0-1.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later
 URL:     https://invent.kde.org/frameworks/%{framework}
 
-%global majmin %(echo %{version} | cut -d. -f1-2)
-%global revision %(echo %{version} | cut -d. -f3)
-%if %{revision} >= 50
-%global stable unstable
-%else
-%global stable stable
-%endif
+%global majmin %majmin_ver_kf5
+%global stable %stable_kf5
 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
 ## upstream patches
 
 ## upstreamable patches
 
-BuildRequires: make
+BuildRequires:  cmake(Qca-qt5)
+
 BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  qgpgme-devel
+BuildRequires:  libgcrypt-devel
+BuildRequires:  make
+BuildRequires:  qt5-qtbase-devel
+
 BuildRequires:  kf5-kconfig-devel >= %{majmin}
 BuildRequires:  kf5-kconfigwidgets-devel >= %{majmin}
 BuildRequires:  kf5-kcoreaddons-devel >= %{majmin}
@@ -44,10 +47,6 @@ BuildRequires:  kf5-kwidgetsaddons-devel >= %{majmin}
 BuildRequires:  kf5-kwindowsystem-devel >= %{majmin}
 BuildRequires:  kf5-rpm-macros
 
-BuildRequires:  qt5-qtbase-devel
-
-BuildRequires:  libgcrypt-devel
-
 %if ! 0%{?bootstrap} && 0%{?fedora}
 # optional gpgme suppot
 BuildRequires:  cmake(Gpgmepp)
@@ -62,6 +61,10 @@ Requires:       pinentry-gui
 Recommends:     pinentry-gui
 %endif
 
+%if %{with kf6_compat}
+Requires:       kf6-%{framework}%{?_isa}
+%endif
+
 %description
 KWallet is a secure and unified container for user passwords.
 
@@ -87,12 +90,16 @@ developing applications that use %{name}.
 
 %build
 %{cmake_kf5} \
-  -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
+  -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \
+  %{?with_kf6_compat:-DBUILD_KWALLETD=OFF}
 %cmake_build
 
 
 %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
 
@@ -108,19 +115,23 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 %doc README.md
 %license LICENSES/*.txt
 %{_kf5_datadir}/qlogging-categories5/%{framework}*
+%if %{without kf6_compat}
 %{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service
+%{_kf5_bindir}/kwallet-query
 %{_kf5_bindir}/kwalletd5
 %{_kf5_datadir}/kservices5/kwalletd5.desktop
 %{_kf5_datadir}/applications/org.kde.kwalletd5.desktop
 %{_kf5_datadir}/knotifications5/kwalletd5.notifyrc
-%{_kf5_bindir}/kwallet-query
 %{_mandir}/man1/kwallet-query.1*
+%endif
 
 %ldconfig_scriptlets libs
 
 %files libs
 %{_kf5_libdir}/libKF5Wallet.so.*
+%if %{without kf6_compat}
 %{_kf5_libdir}/libkwalletbackend5.so.*
+%endif
 
 %files devel
 %{_kf5_datadir}/dbus-1/interfaces/kf5_org.kde.KWallet.xml
@@ -128,11 +139,92 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 %{_kf5_includedir}/KWallet/
 %{_kf5_libdir}/cmake/KF5Wallet/
 %{_kf5_libdir}/libKF5Wallet.so
+%if %{without kf6_compat}
 %{_kf5_libdir}/libkwalletbackend5.so
+%endif
 %{_kf5_archdatadir}/mkspecs/modules/qt_KWallet.pri
 
 
 %changelog
+* Sat Feb 10 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.115.0-1
+- 5.115.0
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.113.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.113.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 08 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.113.0-1
+- 5.113.0
+
+* Mon Oct 16 2023 Alessandro Astone <ales.astone@gmail.com> - 5.111.0-4
+- Require kf6-kwallet if compat build
+
+* Sun Oct 15 2023 Justin Zobel <justin.zobel@gmail.com> - 5.111.0-3
+- Move {_kf5_bindir}/kwallet-query into if statement as it conflicts with KF6 KWallet
+
+* Thu Oct 12 2023 Alessandro Astone <ales.astone@gmail.com> - 5.111.0-2
+- Add KF6 compatibility flag
+
+* Tue Oct 10 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.111.0-1
+- 5.111.0
+
+* Tue Sep 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.110.0-1
+- 5.110.0
+
+* Sat Aug 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.109.0-1
+- 5.109.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.108.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jul 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.108.0-1
+- 5.108.0
+
+* Sat Jun 03 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.107.0-1
+- 5.107.0
+
+* Mon May 15 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.106.0-1
+- 5.106.0
+
+* Sun Apr 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.105.0-1
+- 5.105.0
+
+* Sat Mar 04 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.104.0-1
+- 5.104.0
+
+* Tue Feb 28 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.103.0-2
+- Add missing BuildRequires
+
+* Sun Feb 05 2023 Marc Deop <marcdeop@fedoraproject.org> - 5.103.0-1
+- 5.103.0
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.102.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jan 14 2023 Marc Deop <marcdeop@fedoraproject.org> - 5.102.0-1
+- 5.102.0
+
+* Mon Dec 12 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.101.0-1
+- 5.101.0
+- use new macros to simplify code
+
+* Sun Nov 06 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.100.0-1
+- 5.100.0
+
+* Fri Oct 14 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.99.0-1
+- 5.99.0
+
+* Thu Sep 15 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.98.0-1
+- 5.98.0
+
+* Sat Aug 13 2022 Justin Zobel <justin@1707.io> - 5.97.0-1
+- Update to 5.97.0
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.96.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sun Jul 03 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.96.0-1
 - 5.96.0
 

sources

@@ -1 +1 @@
-SHA512 (kwallet-5.96.0.tar.xz) = ce84bcf07e6e053075960132d27cc1e709327433d61ff25cef34b886ec6ed885fd5a0d1c5cf3b74694698006b8d3ce231f7c132ecd12acd2c9f05e81e5d488f7
+SHA512 (kwallet-5.115.0.tar.xz) = 8870af27ab6dfe5a7f9c60a8199b917e3f0ad81e48524c5ea383c39d6e3ca6a2fbe7bbce9b645a190c33a58bc7e63347e1737b6f55783fefa2a46bf7bab598fe