diff --git a/.gitignore b/.gitignore index 3e90bba..e61cc9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/solid-5.108.0.tar.xz +SOURCES/solid-5.115.0.tar.xz diff --git a/.kf5-solid.metadata b/.kf5-solid.metadata index 9f81c31..b57dc29 100644 --- a/.kf5-solid.metadata +++ b/.kf5-solid.metadata @@ -1 +1 @@ -518ab72f2aa8ef1ba8ea70870d3dc38b4c311f22 SOURCES/solid-5.108.0.tar.xz +a0c30d48fe824a261e341410fa244b5ffd697a77 SOURCES/solid-5.115.0.tar.xz diff --git a/SPECS/kf5-solid.spec b/SPECS/kf5-solid.spec index ae33d56..8442607 100644 --- a/SPECS/kf5-solid.spec +++ b/SPECS/kf5-solid.spec @@ -1,11 +1,11 @@ %global framework solid Name: kf5-%{framework} -Version: 5.108.0 +Version: 5.115.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 integration module that provides hardware information -License: LGPLv2+ +License: BSD-3-Clause AND CC0-1.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) URL: https://solid.kde.org/ %global majmin %majmin_ver_kf5 @@ -64,6 +64,9 @@ developing applications that use %{name}. %prep %autosetup -n %{framework}-%{version} -p1 +# do not build the solid-power executable, it conflicts with KF6 Solid +sed -i -e 's/if(WITH_NEW_SOLID_JOB AND WITH_NEW_POWER_ASYNC_API)/if(0)/g' \ + src/tools/CMakeLists.txt %build @@ -88,8 +91,6 @@ developing applications that use %{name}. %license LICENSES/*.txt %{_kf5_datadir}/qlogging-categories5/%{framework}.* %{_kf5_bindir}/solid-hardware5 -# if building with new WIP api's -%{_kf5_bindir}/solid-power #files libs %{_kf5_qmldir}/org/kde/solid/ %{_kf5_libdir}/libKF5Solid.so.* @@ -102,9 +103,44 @@ developing applications that use %{name}. %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 + +* 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 + +* Wed Aug 23 2023 Kevin Kofler - 5.109.0-2 +- Restore the power management backend, needed for plasma-pk-updates (#2233613) +- But do not build the solid-power executable that conflicts with KF6 Solid + +* Sat Aug 05 2023 Marc Deop i Argemí - 5.109.0-1 +- 5.109.0 + +* Fri Jul 28 2023 Michel Alexandre Salim - 5.108.0-4 +- Rebuilt for libimobiledevice and libplist soname bump +- Remove solid-power from files listing, since WIP APIs are no longer enabled (rhbz#2225952) + +* Wed Jul 26 2023 Arkady L. Shane - 5.108.0-3 - Rebuilt for MSVSphere 9.2 +* Thu Jul 20 2023 Fedora Release Engineering - 5.108.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 04 2023 Justin Zobel - 5.108.0-2 +- Remove experimental build options as per https://invent.kde.org/frameworks/solid/-/issues/4#note_701619 + * Sun Jul 02 2023 Marc Deop i Argemí - 5.108.0-1 - 5.108.0