diff --git a/.gitignore b/.gitignore index ca661d2..7ad8a59 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,47 @@ /baloo-5.66.0.tar.xz /baloo-5.67.0.tar.xz /baloo-5.68.0.tar.xz +/baloo-5.69.0.tar.xz +/baloo-5.70.0.tar.xz +/baloo-5.71.0.tar.xz +/baloo-5.72.0.tar.xz +/baloo-5.73.0.tar.xz +/baloo-5.74.0.tar.xz +/baloo-5.75.0.tar.xz +/baloo-5.76.0.tar.xz +/baloo-5.77.0.tar.xz +/baloo-5.78.0.tar.xz +/baloo-5.79.0.tar.xz +/baloo-5.80.0.tar.xz +/baloo-5.81.0.tar.xz +/baloo-5.82.0.tar.xz +/baloo-5.83.0.tar.xz +/baloo-5.85.0.tar.xz +/baloo-5.86.0.tar.xz +/baloo-5.87.0.tar.xz +/baloo-5.88.0.tar.xz +/baloo-5.89.0.tar.xz +/baloo-5.90.0.tar.xz +/baloo-5.91.0.tar.xz +/baloo-5.92.0.tar.xz +./baloo-5.93.tar.xz +/baloo-5.94.0.tar.xz +/baloo-5.96.0.tar.xz +/baloo-5.97.0.tar.xz +/baloo-5.98.0.tar.xz +/baloo-5.99.0.tar.xz +/baloo-5.100.0.tar.xz +/baloo-5.101.0.tar.xz +/baloo-5.102.0.tar.xz +/baloo-5.103.0.tar.xz +/baloo-5.104.0.tar.xz +/baloo-5.105.0.tar.xz +/baloo-5.106.0.tar.xz +/baloo-5.107.0.tar.xz +/baloo-5.108.0.tar.xz +/baloo-5.109.0.tar.xz +/baloo-5.110.0.tar.xz +/baloo-5.111.0.tar.xz +/baloo-5.113.0.tar.xz +/baloo-5.115.0.tar.xz +/baloo-5.116.0.tar.xz diff --git a/baloo_file_shutdown.sh b/baloo_file_shutdown.sh new file mode 100644 index 0000000..6aadda9 --- /dev/null +++ b/baloo_file_shutdown.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# workaround for baloo_file processes persisting +# after logout, parent bug: +# https://bugzilla.redhat.com/show_bug.cgi?id=1861700 + +qdbus-qt5 org.kde.baloo >& /dev/null && \ +qdbus-qt5 org.kde.baloo / org.kde.baloo.quit ||: diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 54a7724..a187e19 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -1,4 +1,6 @@ -%global framework baloo +%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] + +%global framework baloo # uncomment to enable bootstrap mode #global bootstrap 1 @@ -9,25 +11,21 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.68.0 -Release: 1%{?dist} +Version: 5.116.0 +Release: 4%{?dist} -# libs are LGPL, tools are GPL -# KDE e.V. may determine that future LGPL/GPL versions are accepted -License: (LGPLv2 or LGPLv3) and (GPLv2 or GPLv3) +License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo -#URL: https://cgit.kde.org/%{framework}.git +#URL: https://invent.kde.org/frameworks/%{framework} -%global majmin %(echo %{version} | cut -d. -f1-2) -%global revision %(echo %{version} | cut -d. -f3) -%if %{revision} >= 50 -%global stable unstable -%else -%global stable stable -%endif +%global majmin %majmin_ver_kf5 +%global stable %stable_kf5 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz Source1: 97-kde-baloo-filewatch-inotify.conf +# shutdown script to explictly stop baloo_file on logout +# Now that baloo supports systemd user unit, this can probably be dropped -- rex +Source2: baloo_file_shutdown.sh ## upstreamable patches # http://bugzilla.redhat.com/1235026 @@ -51,6 +49,9 @@ BuildRequires: lmdb-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel +# for systemd-related macros +BuildRequires: systemd + %if 0%{?tests} BuildRequires: dbus-x11 BuildRequires: time @@ -86,6 +87,7 @@ Requires: qt5-qtbase-devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%if %{without kf6_compat} %package file Summary: File indexing and search for Baloo # KDE e.V. may determine that future LGPL versions are accepted @@ -99,6 +101,7 @@ Conflicts: baloo-file < 5 Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description file %{summary}. +%endif %package libs Summary: Runtime libraries for %{name} @@ -113,43 +116,50 @@ License: LGPLv2 or LGPLv3 %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. \ - -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} -popd - -%make_build -C %{_target_platform} +%{cmake_kf5} \ + -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \ + %{?with_kf6_compat:-DBUILD_INDEXER_SERVICE=OFF} +%cmake_build %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%cmake_install + +%if 0%{?flatpak:1} +find %{buildroot} -name kde-baloo.service -delete +%endif # baloodb not installed unless BUILD_EXPERIMENTAL is enabled, so omit translations rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/baloodb5.* +%if %{without kf6_compat} install -p -m644 -D %{SOURCE1} %{buildroot}%{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf +install -p -m755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/shutdown/baloo_file.sh +%endif %find_lang kio5_baloosearch %find_lang kio5_tags %find_lang kio5_timeline %find_lang balooctl5 -#find_lang baloodb5 %find_lang balooengine5 %find_lang baloosearch5 %find_lang balooshow5 %find_lang baloo_file5 %find_lang baloo_file_extractor5 -%find_lang baloomonitorplugin +#find_lang baloomonitorplugin cat kio5_tags.lang kio5_baloosearch.lang kio5_timeline.lang \ balooctl5.lang balooengine5.lang baloosearch5.lang \ - balooshow5.lang baloomonitorplugin.lang \ + balooshow5.lang \ > %{name}.lang cat baloo_file5.lang baloo_file_extractor5.lang \ > %{name}-file.lang +%if %{with kf6_compat} +cat %{name}-file.lang | xargs printf "%{buildroot}%.0s%s\n" | xargs rm +%endif + %check %if 0%{?tests} @@ -162,23 +172,33 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %files -f %{name}.lang -%license COPYING +%license LICENSES/*.txt #{_kf5_bindir}/baloodb %{_kf5_bindir}/baloosearch %{_kf5_bindir}/balooshow +%if %{without kf6_compat} %{_kf5_bindir}/balooctl +%endif %{_kf5_datadir}/qlogging-categories5/%{framework}* +%if %{without kf6_compat} %files file -f %{name}-file.lang %{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf +%config(noreplace) %{_sysconfdir}/xdg/plasma-workspace/shutdown/baloo_file.sh %{_kf5_bindir}/baloo_file %{_kf5_bindir}/baloo_file_extractor -%{_kf5_sysconfdir}/xdg/autostart/baloo_file.desktop +%config(noreplace) %{_kf5_sysconfdir}/xdg/autostart/baloo_file.desktop +%if ! 0%{?flatpak:1} +%{_userunitdir}/kde-baloo.service +%endif +%{_libexecdir}/baloo_file +%{_libexecdir}/baloo_file_extractor +%endif %ldconfig_scriptlets libs %files libs -%license COPYING.LIB +%license LICENSES/*.txt %{_kf5_libdir}/libKF5Baloo.so.* %{_kf5_libdir}/libKF5BalooEngine.so.* # multilib'd plugins and friends @@ -187,22 +207,212 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %{_kf5_plugindir}/kio/timeline.so %{_kf5_plugindir}/kded/baloosearchmodule.so %{_kf5_qmldir}/org/kde/baloo -%{_kf5_datadir}/kservices5/baloosearch.protocol -%{_kf5_datadir}/kservices5/tags.protocol -%{_kf5_datadir}/kservices5/timeline.protocol %files devel %{_kf5_libdir}/libKF5Baloo.so %{_kf5_libdir}/cmake/KF5Baloo/ %{_kf5_libdir}/pkgconfig/Baloo.pc %{_kf5_includedir}/Baloo/ -%{_kf5_includedir}/baloo_version.h + %{_kf5_archdatadir}/mkspecs/modules/qt_Baloo.pri +%if %{without kf6_compat} %{_kf5_datadir}/dbus-1/interfaces/org.kde.baloo.*.xml %{_kf5_datadir}/dbus-1/interfaces/org.kde.Baloo*.xml +%endif %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 + +* Thu Feb 22 2024 Alessandro Astone - 5.115.0-2 +- Drop kf5-baloo-file subpackage, obsoleted by kf6-baloo-file + +* Sat Feb 10 2024 Marc Deop i Argemí - 5.115.0-1 +- 5.115.0 + +* Wed Jan 24 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-3 +- Require kf6-baloo 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 + +* Wed Jun 07 2023 Marc Deop i Argemí - 5.107.0-2 +- Backport patch from upstream + +* 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 + +* Sun Apr 02 2023 Marc Deop i Argemí - 5.105.0-1 +- 5.105.0 + +* Sat Mar 04 2023 Marc Deop i Argemí - 5.104.0-1 +- 5.104.0 + +* Sun Feb 05 2023 Marc Deop - 5.103.0-1 +- 5.103.0 + +* Thu Jan 19 2023 Fedora Release Engineering - 5.102.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jan 14 2023 Marc Deop - 5.102.0-1 +- 5.102.0 + +* Mon Dec 12 2022 Marc Deop - 5.101.0-1 +- 5.101.0 +- use new macros to simplify code + +* Sun Nov 06 2022 Marc Deop - 5.100.0-1 +- 5.100.0 + +* Fri Oct 14 2022 Marc Deop - 5.99.0-1 +- 5.99.0 + +* Thu Sep 15 2022 Marc Deop - 5.98.0-1 +- 5.98.0 + +* Sat Aug 13 2022 Justin Zobel - 5.97.0-1 +- Update to 5.97.0 + +* Thu Jul 21 2022 Fedora Release Engineering - 5.96.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jul 03 2022 Marc Deop - 5.96.0-1 +- 5.96.0 + +* Fri May 13 2022 Rex Dieter - 5.94.0-1 +- 5.94.0 + +* Sun Apr 10 2022 Justin Zobel - 5.93-1 +- Update to 5.93 + +* Thu Mar 10 2022 Rex Dieter - 5.92.0-1 +- 5.92.0 + +* Fri Feb 11 2022 Rex Dieter - 5.91.0-1 +- 5.91.0 + +* Thu Jan 20 2022 Fedora Release Engineering - 5.90.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jan 04 2022 Marc Deop i Argemí (Private) - 5.90.0-1 +- 5.90.0 + +* Wed Dec 08 2021 Rex Dieter - 5.89.0-1 +- 5.89.0 + +* Mon Nov 08 2021 Marc Deop - 5.88.0-1 +- 5.88.0 + +* Tue Oct 05 2021 Rex Dieter - 5.87.0-1 +- 5.87.0 + +* Tue Sep 14 2021 Marc Deop - 5.86.0-1 +- 5.86.0 + +* Thu Aug 12 2021 Rex Dieter - 5.85.0-1 +- 5.85.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 5.83.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 08 2021 Rex Dieter - 5.83.0-1 +- 5.83.0 + +* Mon May 03 2021 Rex Dieter - 5.82.0-1 +- 5.82.0 +- new systemd user kde-baloo.service + +* Tue Apr 06 2021 Rex Dieter - 5.81.0-1 +- 5.81.0 + +* Tue Mar 09 2021 Rex Dieter - 5.80.0-1 +- 5.80.0 + +* Sat Feb 06 2021 Rex Dieter - 5.79.0-2 +- respin + +* Sat Feb 06 2021 Rex Dieter - 5.79.0-1 +- 5.79.0 + +* Tue Jan 26 2021 Fedora Release Engineering - 5.78.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 4 08:37:51 CST 2021 Rex Dieter - 5.78.0-1 +- 5.78.0 + +* Sun Dec 13 14:06:56 CST 2020 Rex Dieter - 5.77.0-1 +- 5.77.0 + +* Thu Nov 19 08:53:35 CST 2020 Rex Dieter - 5.76.0-1 +- 5.76.0 + +* Wed Oct 14 09:44:03 CDT 2020 Rex Dieter - 5.75.0-1 +- 5.75.0 + +* Fri Sep 18 2020 Jan Grulich - 5.74.0-1 +- 5.74.0 + +* Tue Sep 15 2020 Rex Dieter - 5.73.0-3 +- shutdown scripts must be executable+valid shell (apparently) + +* Mon Sep 14 2020 Rex Dieter - 5.73.0-2 +- add explicit shutdown script for baloo_file (parent bug #1861700) + +* Mon Aug 03 2020 Rex Dieter - 5.73.0-1 +- 5.73.0 + +* Tue Jul 28 2020 Fedora Release Engineering - 5.72.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 07 2020 Rex Dieter - 5.72.0-1 +- 5.72.0 + +* Tue Jun 16 2020 Rex Dieter - 5.71.0-1 +- 5.71.0 + +* Mon May 04 2020 Rex Dieter - 5.70.0-1 +- 5.70.0 + +* Tue Apr 21 2020 Rex Dieter - 5.69.0-1 +- 5.69.0 + * Fri Mar 20 2020 Rex Dieter - 5.68.0-1 - 5.68.0 diff --git a/sources b/sources index 27cb738..ed77600 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.68.0.tar.xz) = 54aa3d9a8e135fbc76b0583b2e5261bf027163addafabc7179e990a6c8c92eadc49195b6f66d77408a3ad74c2f7a3ab4328bc7afb243d1be519e78d0223ea2a6 +SHA512 (baloo-5.116.0.tar.xz) = 956a07009fa83f852fa88a7bcabffc73343072e30650cc7000e385f73e467aa2c7c440b41715405fc0a59d68ad8e533c2587e06de8475f24b49e1fa35d8b2486