diff --git a/.gitignore b/.gitignore index 91204cf..f9525f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ktexteditor-5.108.0.tar.xz +SOURCES/ktexteditor-5.115.0.tar.xz diff --git a/.kf5-ktexteditor.metadata b/.kf5-ktexteditor.metadata index c22dcc4..49b2eac 100644 --- a/.kf5-ktexteditor.metadata +++ b/.kf5-ktexteditor.metadata @@ -1 +1 @@ -108919651c214aba9d062873a0b67ae94211fcd7 SOURCES/ktexteditor-5.108.0.tar.xz +ed7b9c75f90436e81a31919f017d7ef26e32b8e6 SOURCES/ktexteditor-5.115.0.tar.xz diff --git a/SPECS/kf5-ktexteditor.spec b/SPECS/kf5-ktexteditor.spec index c66bcb9..ce87a4e 100644 --- a/SPECS/kf5-ktexteditor.spec +++ b/SPECS/kf5-ktexteditor.spec @@ -1,5 +1,7 @@ %global framework ktexteditor +%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] + # uncomment to enable bootstrap mode #global bootstrap 1 @@ -8,11 +10,11 @@ %endif Name: kf5-%{framework} -Version: 5.108.0 +Version: 5.115.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 with advanced embeddable text editor -License: LGPLv2+ +License: BSD-2-Clause AND CC0-1.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND MIT URL: https://invent.kde.org/frameworks/%{framework} %global majmin %majmin_ver_kf5 @@ -93,6 +95,11 @@ developing applications that use %{name}. %find_lang %{name} --all-name +%if %{with kf6_compat} +rm -rf %{buildroot}%{_kf5_datadir}/dbus-1/ +rm -rf %{buildroot}%{_kf5_datadir}/polkit-1/ +%endif + # create/own dirs mkdir -p %{buildroot}%{_kf5_qtplugindir}/ktexteditor @@ -120,10 +127,12 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %{_kf5_datadir}/kservices5/katepart.desktop %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_datadir}/katepart5/ -%{_kf5_datadir}/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf %{_kf5_libexecdir}/kauth/kauth_ktexteditor_helper +%if %{without kf6_compat} +%{_kf5_datadir}/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf %{_kf5_datadir}/dbus-1/system-services/org.kde.ktexteditor.katetextbuffer.service %{_kf5_datadir}/polkit-1/actions/org.kde.ktexteditor.katetextbuffer.policy +%endif %files devel %{_kf5_libdir}/libKF5TextEditor.so @@ -136,9 +145,36 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog -* Mon Jan 15 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 + +* Mon Jan 15 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 + +* Sat Nov 18 2023 Alessandro Astone - 5.111.0-2 +- kf6 compatibility support + +* 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