diff --git a/.gitignore b/.gitignore index cea90d0..0944ac5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/kwallet-5.108.0.tar.xz +SOURCES/kwallet-5.115.0.tar.xz diff --git a/.kf5-kwallet.metadata b/.kf5-kwallet.metadata index 13e8223..dc7b0bb 100644 --- a/.kf5-kwallet.metadata +++ b/.kf5-kwallet.metadata @@ -1 +1 @@ -9d86b446a66b1645d8650298ebde1fc33cc3f5e8 SOURCES/kwallet-5.108.0.tar.xz +390ef25953b4717f1b280669983b30c96b98f01d SOURCES/kwallet-5.115.0.tar.xz diff --git a/SPECS/kf5-kwallet.spec b/SPECS/kf5-kwallet.spec index 46a5c3a..4ced1df 100644 --- a/SPECS/kf5-kwallet.spec +++ b/SPECS/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,11 +11,11 @@ %endif Name: kf5-%{framework} -Version: 5.108.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 %majmin_ver_kf5 @@ -59,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. @@ -84,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 @@ -105,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 @@ -125,14 +139,49 @@ 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 -* Wed Jul 26 2023 Arkady L. Shane - 5.108.0-1 +* Sat Feb 10 2024 Marc Deop i Argemí - 5.115.0-1 +- 5.115.0 + +* Thu Jan 25 2024 Fedora Release Engineering - 5.113.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 5.113.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 08 2023 Marc Deop i Argemí - 5.113.0-1 +- 5.113.0 + +* Mon Oct 16 2023 Alessandro Astone - 5.111.0-4 +- Require kf6-kwallet if compat build + +* Sun Oct 15 2023 Justin Zobel - 5.111.0-3 +- Move {_kf5_bindir}/kwallet-query into if statement as it conflicts with KF6 KWallet + +* Thu Oct 12 2023 Alessandro Astone - 5.111.0-2 +- Add KF6 compatibility flag + +* Tue Oct 10 2023 Marc Deop i Argemí - 5.111.0-1 +- 5.111.0 + +* Tue Sep 05 2023 Marc Deop i Argemí - 5.110.0-1 +- 5.110.0 + +* Sat Aug 05 2023 Marc Deop i Argemí - 5.109.0-1 +- 5.109.0 + +* Wed Jul 26 2023 Arkady L. Shane - 5.108.0-2 - Rebuilt for MSVSphere 9.2 +* Thu Jul 20 2023 Fedora Release Engineering - 5.108.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jul 02 2023 Marc Deop i Argemí - 5.108.0-1 - 5.108.0