diff --git a/.gitignore b/.gitignore index 51e4eac..657da8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plasma-framework-5.108.0.tar.xz +SOURCES/plasma-framework-5.115.0.tar.xz diff --git a/.kf5-plasma.metadata b/.kf5-plasma.metadata index b158fd0..4893fed 100644 --- a/.kf5-plasma.metadata +++ b/.kf5-plasma.metadata @@ -1 +1 @@ -170c41646cb860ddc8e98853bba47603268be551 SOURCES/plasma-framework-5.108.0.tar.xz +3189530db2215c0a13828f4103823752edc715d0 SOURCES/plasma-framework-5.115.0.tar.xz diff --git a/SPECS/kf5-plasma.spec b/SPECS/kf5-plasma.spec index 3a49316..592b973 100644 --- a/SPECS/kf5-plasma.spec +++ b/SPECS/kf5-plasma.spec @@ -1,11 +1,13 @@ +%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] + %global framework plasma-framework Name: kf5-plasma -Version: 5.108.0 +Version: 5.115.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface -License: GPLv2+ and LGPLv2+ and BSD +License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) URL: https://invent.kde.org/frameworks/plasma %global majmin %majmin_ver_kf5 @@ -71,7 +73,10 @@ Requires: qt5-qtquickcontrols2%{?_isa} Conflicts: kdeplasma-addons < 5.5.0-3 # upstream name +# used by the plasma-framework package in Plasma 6 +%if %{without kf6_compat} Provides: plasma-framework = %{version}-%{release} +%endif %description %{summary}. @@ -85,7 +90,9 @@ Requires: kf5-kpackage-devel >= %{majmin} Requires: kf5-kservice-devel >= %{majmin} Requires: kf5-kwindowsystem-devel >= %{majmin} Requires: qt5-qtbase-devel +%if %{without kf6_compat} Provides: plasma-framework-devel = %{version}-%{release} +%endif %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -98,7 +105,7 @@ install -m644 -p %{SOURCE10} . %build -%cmake_kf5 +%cmake_kf5 %{?with_kf6_compat:-DBUILD_DESKTOPTHEMES=OFF} %cmake_build @@ -138,11 +145,8 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %{_kf5_qtplugindir}/kpackage/packagestructure/*.so %{_kf5_plugindir}/kirigami/ %{_kf5_datadir}/plasma/ -#{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_mandir}/man1/plasmapkg2.1.* -# can find_lang handle this too somehow? -- rex -%lang(lt) %{_datadir}/locale/lt/LC_SCRIPTS/libplasma5/ %files devel %{_kf5_libdir}/cmake/KF5Plasma/ @@ -159,9 +163,48 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog -* Sun Jan 14 2024 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 + +* Sun Jan 14 2024 Arkady L. Shane - 5.113.0-1 - Rebuilt for MSVSphere 9.3 +* Fri Dec 08 2023 Marc Deop i Argemí - 5.113.0-1 +- 5.113.0 + +* Fri Nov 24 2023 Alessandro Astone - 5.111.0-6 +- Don't require kf6-plasma + +* Mon Nov 13 2023 Alessandro Astone - 5.111.0-5 +- Don't provide the plasma-frameworks name for Plasma 6 + +* Mon Oct 16 2023 Alessandro Astone - 5.111.0-4 +- Fix kf6-plasma requires to be arch-specific + +* Mon Oct 16 2023 Alessandro Astone - 5.111.0-3 +- Require kf6-plasma if compat build + +* 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 + +* 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