diff --git a/.gitignore b/.gitignore index 7ad8a59..488ecbd 100644 --- a/.gitignore +++ b/.gitignore @@ -48,21 +48,3 @@ ./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/kf5-baloo.spec b/kf5-baloo.spec index a187e19..a4ade0e 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -1,6 +1,4 @@ -%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] - -%global framework baloo +%global framework baloo # uncomment to enable bootstrap mode #global bootstrap 1 @@ -11,15 +9,22 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.116.0 -Release: 4%{?dist} +Version: 5.96.0 +Release: 1%{?dist} -License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later +# 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) URL: https://community.kde.org/Baloo #URL: https://invent.kde.org/frameworks/%{framework} -%global majmin %majmin_ver_kf5 -%global stable %stable_kf5 +%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 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz Source1: 97-kde-baloo-filewatch-inotify.conf @@ -87,7 +92,6 @@ 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 @@ -101,7 +105,6 @@ Conflicts: baloo-file < 5 Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description file %{summary}. -%endif %package libs Summary: Runtime libraries for %{name} @@ -117,8 +120,7 @@ License: LGPLv2 or LGPLv3 %build %{cmake_kf5} \ - -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \ - %{?with_kf6_compat:-DBUILD_INDEXER_SERVICE=OFF} + -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} %cmake_build @@ -126,16 +128,14 @@ License: LGPLv2 or LGPLv3 %cmake_install %if 0%{?flatpak:1} -find %{buildroot} -name kde-baloo.service -delete +rm -fv %{buildroot}%{_userunitdir}/kde-baloo.service %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 @@ -144,8 +144,7 @@ install -p -m755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/s %find_lang balooengine5 %find_lang baloosearch5 %find_lang balooshow5 -%find_lang baloo_file5 -%find_lang baloo_file_extractor5 +#find_lang baloo_file5 #find_lang baloomonitorplugin cat kio5_tags.lang kio5_baloosearch.lang kio5_timeline.lang \ @@ -153,12 +152,8 @@ cat kio5_tags.lang kio5_baloosearch.lang kio5_timeline.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 +#cat baloo_file5.lang \ +# > %{name}-file.lang %check @@ -176,13 +171,10 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: #{_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 +%files file %{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf %config(noreplace) %{_sysconfdir}/xdg/plasma-workspace/shutdown/baloo_file.sh %{_kf5_bindir}/baloo_file @@ -193,7 +185,6 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %endif %{_libexecdir}/baloo_file %{_libexecdir}/baloo_file_extractor -%endif %ldconfig_scriptlets libs @@ -215,104 +206,11 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %{_kf5_includedir}/Baloo/ %{_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 diff --git a/sources b/sources index ed77600..c83b0f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.116.0.tar.xz) = 956a07009fa83f852fa88a7bcabffc73343072e30650cc7000e385f73e467aa2c7c440b41715405fc0a59d68ad8e533c2587e06de8475f24b49e1fa35d8b2486 +SHA512 (baloo-5.96.0.tar.xz) = b529720173cd739805b56e311158e288cffd6f6ef866d4f4a87ff01c2f186016c6a79c27f47626ce5437fedcd025a9cbac933bfebf98575fa71257af48c8afc0