diff --git a/.gitignore b/.gitignore index f9cd8f0..2eb04a0 100644 --- a/.gitignore +++ b/.gitignore @@ -57,13 +57,3 @@ /plasma-framework-5.102.0.tar.xz /plasma-framework-5.103.0.tar.xz /plasma-framework-5.104.0.tar.xz -/plasma-framework-5.105.0.tar.xz -/plasma-framework-5.106.0.tar.xz -/plasma-framework-5.107.0.tar.xz -/plasma-framework-5.108.0.tar.xz -/plasma-framework-5.109.0.tar.xz -/plasma-framework-5.110.0.tar.xz -/plasma-framework-5.111.0.tar.xz -/plasma-framework-5.113.0.tar.xz -/plasma-framework-5.115.0.tar.xz -/plasma-framework-5.116.0.tar.xz diff --git a/kf5-plasma.spec b/kf5-plasma.spec index c9df106..84d945a 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -1,13 +1,11 @@ -%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] - %global framework plasma-framework Name: kf5-plasma -Version: 5.116.0 -Release: 4%{?dist} +Version: 5.104.0 +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface -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) +License: GPLv2+ and LGPLv2+ and BSD URL: https://invent.kde.org/frameworks/plasma %global majmin %majmin_ver_kf5 @@ -44,7 +42,9 @@ BuildRequires: kf5-kpackage-devel >= %{majmin} BuildRequires: kf5-kparts-devel >= %{majmin} BuildRequires: kf5-kservice-devel >= %{majmin} BuildRequires: kf5-kirigami2-devel >= %{majmin} +%if 0%{?fedora} BuildRequires: kf5-kwayland-devel >= %{majmin} +%endif BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} BuildRequires: kf5-kwindowsystem-devel >= %{majmin} BuildRequires: kf5-kxmlgui-devel >= %{majmin} @@ -69,14 +69,13 @@ BuildRequires: qt5-qtx11extras-devel Requires: qt5-qtquickcontrols%{?_isa} Requires: qt5-qtquickcontrols2%{?_isa} +%if 0%{?fedora} # https://bugzilla.redhat.com/1293415 Conflicts: kdeplasma-addons < 5.5.0-3 +%endif # upstream name -# used by the plasma-framework package in Plasma 6 -%if %{without kf6_compat} Provides: plasma-framework = %{version}-%{release} -%endif %description %{summary}. @@ -90,9 +89,7 @@ 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}. @@ -105,7 +102,7 @@ install -m644 -p %{SOURCE10} . %build -%cmake_kf5 %{?with_kf6_compat:-DBUILD_DESKTOPTHEMES=OFF} +%cmake_kf5 %cmake_build @@ -119,9 +116,11 @@ install -m644 -p %{SOURCE10} . mkdir -p %{buildroot}%{_kf5_datadir}/plasma/plasmoids mkdir -p %{buildroot}%{_kf5_qmldir}/org/kde/private +%if 0%{?fedora} mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/fedora-plasma-cache.sh +%endif %ldconfig_scriptlets @@ -129,7 +128,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %files -f %{name}.lang %doc README.md %license LICENSES/*.txt +%if 0%{?fedora} %{_sysconfdir}/xdg/plasma-workspace/env/fedora-plasma-cache.sh +%endif %{_kf5_bindir}/plasmapkg2 %{_kf5_libdir}/libKF5Plasma.so.* %{_kf5_libdir}/libKF5PlasmaQuick.so.* @@ -145,8 +146,11 @@ 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/ @@ -163,72 +167,6 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 5.116.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 5.116.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 5.116.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun May 19 2024 Alessandro Astone - 5.116.0-1 -- 5.116.0 - -* 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 - -* 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 - -* Sat Jun 03 2023 Marc Deop i Argemí - 5.107.0-1 -- 5.107.0 - -* Mon May 15 2023 Marc Deop i Argemí - 5.106.0-1 -- 5.106.0 - -* Tue Apr 25 2023 Neal Gompa - 5.105.0-2 -- Restore kf5-kwayland BR to RHEL builds - -* Sun Apr 02 2023 Marc Deop i Argemí - 5.105.0-1 -- 5.105.0 - * Thu Mar 09 2023 Marc Deop i Argemí - 5.104.0-2 - 5.104.0 re-spin diff --git a/sources b/sources index 02a2997..dc61601 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-framework-5.116.0.tar.xz) = d15a1379d14a13c17932c1278b209b0a2f6a07f1abc15cb436f73765f8df12564297541c29bf453991e4dc7d469c5b83ecc53e9e97480d10d8d897597acfe804 +SHA512 (plasma-framework-5.104.0.tar.xz) = 0c327d8cb96b75e41a75fa1ff9a68f4d983f27e8c03c1121efba3dc031b286c331b7aad069a7432b51ca3255e246b980e2e44f60c7f769d291fc25665b17e19f