From 7f82a89c3497e98ec25c0921b970500b6ff43a4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:56:47 +0000 Subject: [PATCH 01/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-baloo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index a4ade0e..86d48dd 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -10,7 +10,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.96.0 -Release: 1%{?dist} +Release: 2%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -211,6 +211,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From 58c2ff48c1bd7ecd2efb4361c42dca14a5194ced Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Sat, 13 Aug 2022 13:51:58 +0930 Subject: [PATCH 02/35] %global variable fix --- kf5-baloo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 86d48dd..0945b73 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -1,4 +1,4 @@ -%global framework baloo +%global framework baloo # uncomment to enable bootstrap mode #global bootstrap 1 From 0aca3f8ae8fd3bc4e31883b152d61d5e65ee1999 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Sun, 14 Aug 2022 13:01:22 +0930 Subject: [PATCH 03/35] Update to 5.97.0 --- .gitignore | 1 + kf5-baloo.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 488ecbd..05ba661 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ ./baloo-5.93.tar.xz /baloo-5.94.0.tar.xz /baloo-5.96.0.tar.xz +/baloo-5.97.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 0945b73..5de13f6 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,8 +9,8 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.96.0 -Release: 2%{?dist} +Version: 5.97.0 +Release: 1%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -211,6 +211,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index c83b0f7..5f0c522 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (baloo-5.96.0.tar.xz) = b529720173cd739805b56e311158e288cffd6f6ef866d4f4a87ff01c2f186016c6a79c27f47626ce5437fedcd025a9cbac933bfebf98575fa71257af48c8afc0 +SHA512 (baloo-5.97.0.tar.xz) = 17765c9b1a4a689e525e11ff74baf611b55a92e25df2c2d7abea2d6e2d85c8386f85a0ba27577264b946b7891076add5663b7a0945d15f1e6981e5674f380951 From 0d1414b463a9b009cf3228548cf3bde86cc5124c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Thu, 15 Sep 2022 17:59:18 +0200 Subject: [PATCH 04/35] 5.98.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 05ba661..3c9c11f 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /baloo-5.94.0.tar.xz /baloo-5.96.0.tar.xz /baloo-5.97.0.tar.xz +/baloo-5.98.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 5de13f6..e398deb 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.97.0 +Version: 5.98.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -211,6 +211,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 5f0c522..34fa5cd 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (baloo-5.96.0.tar.xz) = b529720173cd739805b56e311158e288cffd6f6ef866d4f4a87ff01c2f186016c6a79c27f47626ce5437fedcd025a9cbac933bfebf98575fa71257af48c8afc0 -SHA512 (baloo-5.97.0.tar.xz) = 17765c9b1a4a689e525e11ff74baf611b55a92e25df2c2d7abea2d6e2d85c8386f85a0ba27577264b946b7891076add5663b7a0945d15f1e6981e5674f380951 +SHA512 (baloo-5.98.0.tar.xz) = 44680ceee15c642f50d2a9c1c0bda8af9990d4cf8061de0aa78741a9b0a644e94299eb42450ef043f336ba36d3e0cb5f9a02673346f4a644e463d1d328112fde From f964ee9f0765aa6f745397b411a1ed666d1b618a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Fri, 14 Oct 2022 17:00:04 +0200 Subject: [PATCH 05/35] 5.99.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3c9c11f..0d5babd 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /baloo-5.96.0.tar.xz /baloo-5.97.0.tar.xz /baloo-5.98.0.tar.xz +/baloo-5.99.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index e398deb..7f5b2a8 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.98.0 +Version: 5.99.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -211,6 +211,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 34fa5cd..f851062 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.98.0.tar.xz) = 44680ceee15c642f50d2a9c1c0bda8af9990d4cf8061de0aa78741a9b0a644e94299eb42450ef043f336ba36d3e0cb5f9a02673346f4a644e463d1d328112fde +SHA512 (baloo-5.99.0.tar.xz) = be480e9a43c056a02d351ec1e935bc89493d303bd501dcbb71f4be78e4f1122a7d26759600e640d4cdf4a2240fd28b322f7d3dbf5e6794e16b7295a64bbd4f61 From 47150ed140cdfd235df278087bb906df74199efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 6 Nov 2022 22:29:01 +0100 Subject: [PATCH 06/35] 5.100.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0d5babd..2b9b458 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /baloo-5.97.0.tar.xz /baloo-5.98.0.tar.xz /baloo-5.99.0.tar.xz +/baloo-5.100.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 7f5b2a8..9baa543 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.99.0 +Version: 5.100.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -211,6 +211,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index f851062..75d1999 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.99.0.tar.xz) = be480e9a43c056a02d351ec1e935bc89493d303bd501dcbb71f4be78e4f1122a7d26759600e640d4cdf4a2240fd28b322f7d3dbf5e6794e16b7295a64bbd4f61 +SHA512 (baloo-5.100.0.tar.xz) = d024be82dde2f9691e0c754a31bb1a1762cbf27be3a93573ecc70e8a1d0e00d791338d7fabda555ef8098413e0a93cd689caaddd09f840284fdcfa4322986401 From dcf72f44d9212f598d19e1d6196b49285774d7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Mon, 12 Dec 2022 16:02:52 +0100 Subject: [PATCH 07/35] 5.101.0 --- .gitignore | 1 + kf5-baloo.spec | 13 ++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2b9b458..67d2826 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /baloo-5.98.0.tar.xz /baloo-5.99.0.tar.xz /baloo-5.100.0.tar.xz +/baloo-5.101.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 9baa543..95942dd 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.100.0 +Version: 5.101.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -19,12 +19,7 @@ URL: https://community.kde.org/Baloo #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 stable %stable_kf5 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz Source1: 97-kde-baloo-filewatch-inotify.conf @@ -211,6 +206,10 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 75d1999..4efbecb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.100.0.tar.xz) = d024be82dde2f9691e0c754a31bb1a1762cbf27be3a93573ecc70e8a1d0e00d791338d7fabda555ef8098413e0a93cd689caaddd09f840284fdcfa4322986401 +SHA512 (baloo-5.101.0.tar.xz) = eaa5d2521bfcc4eb6c63789c66d7b91c4d4de095a719b4ac15e8781dd0d8ab33a7f009e3884a49f12cdb89df5721245bda9433790b3c81bab3c33aa4afd73dff From 54a852e303672bcb8d49c813fad0e92f5a23f970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 14 Jan 2023 16:40:35 +0100 Subject: [PATCH 08/35] 5.102.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 67d2826..e92b4dc 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /baloo-5.99.0.tar.xz /baloo-5.100.0.tar.xz /baloo-5.101.0.tar.xz +/baloo-5.102.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 95942dd..0797183 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.101.0 +Version: 5.102.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -206,6 +206,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 4efbecb..3b5963e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.101.0.tar.xz) = eaa5d2521bfcc4eb6c63789c66d7b91c4d4de095a719b4ac15e8781dd0d8ab33a7f009e3884a49f12cdb89df5721245bda9433790b3c81bab3c33aa4afd73dff +SHA512 (baloo-5.102.0.tar.xz) = ab2c2e5da169371e3bb27344f31b42f4ec63bc18fee0e3812a21e66e75c9e826f00f2e8ca8186b9660579b6990e67a162d0db14195b6b0b8de5fe9792966b25e From 25de4ae25c12ed2dbd70a0cf9f80a7ce55662084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 15 Jan 2023 17:46:21 +0100 Subject: [PATCH 09/35] fix: use macros from macros.kf5 instead of custom code --- kf5-baloo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 0797183..c5604b9 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -18,7 +18,7 @@ License: (LGPLv2 or LGPLv3) and (GPLv2 or GPLv3) URL: https://community.kde.org/Baloo #URL: https://invent.kde.org/frameworks/%{framework} -%global majmin %(echo %{version} | cut -d. -f1-2) +%global majmin %majmin_ver_kf5 %global stable %stable_kf5 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz From 6016d2795ee5694375b04c698bbac70bb529ce35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:26:32 +0000 Subject: [PATCH 10/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-baloo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index c5604b9..3185b52 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -10,7 +10,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.102.0 -Release: 1%{?dist} +Release: 2%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -206,6 +206,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From 650153d119a33d129cf7a4a01ae25cca7bff9faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 5 Feb 2023 17:38:19 +0100 Subject: [PATCH 11/35] 5.103.0 --- .gitignore | 1 + kf5-baloo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e92b4dc..b6787fa 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /baloo-5.100.0.tar.xz /baloo-5.101.0.tar.xz /baloo-5.102.0.tar.xz +/baloo-5.103.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 3185b52..62dd508 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,8 +9,8 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.102.0 -Release: 2%{?dist} +Version: 5.103.0 +Release: 1%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -206,6 +206,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 3b5963e..cdf2ab5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.102.0.tar.xz) = ab2c2e5da169371e3bb27344f31b42f4ec63bc18fee0e3812a21e66e75c9e826f00f2e8ca8186b9660579b6990e67a162d0db14195b6b0b8de5fe9792966b25e +SHA512 (baloo-5.103.0.tar.xz) = 7c307d750c06fbf0a0b0ef5618691f663e720eb091baf2d143ebd48abd4d46224a5c92d3dbee0be52ebf25cffc7b8abb1005fad552e89370860829844e5f9bed From 230da28b0158ae82dab04c2565ab2c99b65f2506 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 26 Feb 2023 13:31:43 -0500 Subject: [PATCH 12/35] Fix flatpak build %_userunitdir is defined with a fixed /usr prefix, but the package currently installs everything (including the unit file) into the same prefix, which is /app in flatpak builds. --- kf5-baloo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 62dd508..27e0cd3 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -123,7 +123,7 @@ License: LGPLv2 or LGPLv3 %cmake_install %if 0%{?flatpak:1} -rm -fv %{buildroot}%{_userunitdir}/kde-baloo.service +find %{buildroot} -name kde-baloo.service -delete %endif # baloodb not installed unless BUILD_EXPERIMENTAL is enabled, so omit translations From 6041c006e48e9439886bb30dc0a5f2aa6f6a64c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 4 Mar 2023 17:24:41 +0100 Subject: [PATCH 13/35] 5.104.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b6787fa..8035c88 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /baloo-5.101.0.tar.xz /baloo-5.102.0.tar.xz /baloo-5.103.0.tar.xz +/baloo-5.104.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 27e0cd3..1c3ccb0 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.103.0 +Version: 5.104.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -206,6 +206,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index cdf2ab5..665cf58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.103.0.tar.xz) = 7c307d750c06fbf0a0b0ef5618691f663e720eb091baf2d143ebd48abd4d46224a5c92d3dbee0be52ebf25cffc7b8abb1005fad552e89370860829844e5f9bed +SHA512 (baloo-5.104.0.tar.xz) = 80ecea86735606798f8500eafcceee5b5dda13c33c2707791baf88d6961d843d239264aea27c1d97c131d8558b4421a251e1c9aed823e3d9214f633488f860fa From bf79795963f49b78376a6dddb32062feff9a2640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 5 Mar 2023 09:57:51 +0100 Subject: [PATCH 14/35] fix: add lang files --- kf5-baloo.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 1c3ccb0..24ebd31 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -139,7 +139,8 @@ 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_file5 +%find_lang baloo_file_extractor5 #find_lang baloomonitorplugin cat kio5_tags.lang kio5_baloosearch.lang kio5_timeline.lang \ @@ -147,8 +148,8 @@ cat kio5_tags.lang kio5_baloosearch.lang kio5_timeline.lang \ balooshow5.lang \ > %{name}.lang -#cat baloo_file5.lang \ -# > %{name}-file.lang +cat baloo_file5.lang baloo_file_extractor5.lang \ + > %{name}-file.lang %check @@ -169,7 +170,7 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %{_kf5_bindir}/balooctl %{_kf5_datadir}/qlogging-categories5/%{framework}* -%files file +%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 From 869658e912c31d446a359849abe8ce958a578b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 2 Apr 2023 10:21:00 +0200 Subject: [PATCH 15/35] 5.105.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8035c88..dd2d0a9 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /baloo-5.102.0.tar.xz /baloo-5.103.0.tar.xz /baloo-5.104.0.tar.xz +/baloo-5.105.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 24ebd31..d806545 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.104.0 +Version: 5.105.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -207,6 +207,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 665cf58..92fd56c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.104.0.tar.xz) = 80ecea86735606798f8500eafcceee5b5dda13c33c2707791baf88d6961d843d239264aea27c1d97c131d8558b4421a251e1c9aed823e3d9214f633488f860fa +SHA512 (baloo-5.105.0.tar.xz) = d85d541c74f03545e5662471d0b9b430a05fa5649b675841d44973a05d64a8dfea092d1e1d57360d4fabe8b5c12400dab30748f60d2d738e3d1df71f09b7677c From ddae48e3c8d6f60bae049591076a574907bab9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Mon, 15 May 2023 21:55:20 +0200 Subject: [PATCH 16/35] 5.106.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd2d0a9..074ffa0 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /baloo-5.103.0.tar.xz /baloo-5.104.0.tar.xz /baloo-5.105.0.tar.xz +/baloo-5.106.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index d806545..09031bd 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.105.0 +Version: 5.106.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -207,6 +207,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 92fd56c..72cddd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.105.0.tar.xz) = d85d541c74f03545e5662471d0b9b430a05fa5649b675841d44973a05d64a8dfea092d1e1d57360d4fabe8b5c12400dab30748f60d2d738e3d1df71f09b7677c +SHA512 (baloo-5.106.0.tar.xz) = 4270bca2bb7a0a82383b195d87689df4a868dc6ba510d2aee2d26aeb853451c437ac9340bcb6954acba5a1c8c92fb36b8702dfabb4c5f5ab61bc17f7def61318 From 1fc406a484b541fa00f28b48d71c814f68b39d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 3 Jun 2023 15:29:15 +0200 Subject: [PATCH 17/35] 5.107.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 074ffa0..1bf4518 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /baloo-5.104.0.tar.xz /baloo-5.105.0.tar.xz /baloo-5.106.0.tar.xz +/baloo-5.107.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 09031bd..d3f2c53 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.106.0 +Version: 5.107.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -207,6 +207,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 72cddd0..e53e5e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.106.0.tar.xz) = 4270bca2bb7a0a82383b195d87689df4a868dc6ba510d2aee2d26aeb853451c437ac9340bcb6954acba5a1c8c92fb36b8702dfabb4c5f5ab61bc17f7def61318 +SHA512 (baloo-5.107.0.tar.xz) = f264e0061b375b8afde4f9167d5e08533dac53aef34517476bfe06b9d93d16af459df4394b25b2f1af5f55cf545773d7281ec047ee81d8980ba41cc6a50302c0 From c35eac32e7e6e443156d7964dae9084a106334fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Wed, 7 Jun 2023 21:08:37 +0200 Subject: [PATCH 18/35] fix: backport patch from upstream to fix btrfs re-indexing --- kf5-baloo.spec | 7 ++- ...the_device_identifier_where_possible.patch | 43 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 use_the_FSID_as_the_device_identifier_where_possible.patch diff --git a/kf5-baloo.spec b/kf5-baloo.spec index d3f2c53..cbfab7f 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -10,7 +10,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.107.0 -Release: 1%{?dist} +Release: 2%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -30,6 +30,8 @@ Source2: baloo_file_shutdown.sh ## upstreamable patches # http://bugzilla.redhat.com/1235026 Patch100: baloo-5.67.0-baloofile_config.patch +# https://invent.kde.org/frameworks/baloo/-/merge_requests/131 +Patch101: use_the_FSID_as_the_device_identifier_where_possible.patch ## upstream patches @@ -207,6 +209,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/use_the_FSID_as_the_device_identifier_where_possible.patch b/use_the_FSID_as_the_device_identifier_where_possible.patch new file mode 100644 index 0000000..89ce3cd --- /dev/null +++ b/use_the_FSID_as_the_device_identifier_where_possible.patch @@ -0,0 +1,43 @@ +diff --git a/src/engine/idutils.h b/src/engine/idutils.h +index 78d881a96e894d731ba024acc8cc74b47823c96b..606ac9dca0a647fcc78ffb031c081201fbb1a491 100644 +--- a/src/engine/idutils.h ++++ b/src/engine/idutils.h +@@ -13,6 +13,8 @@ + + #ifdef Q_OS_WIN + # include ++#else ++# include + #endif + + namespace Baloo { +@@ -40,10 +42,28 @@ inline quint64 statBufToId(const QT_STATBUF& stBuf) + static_cast(stBuf.st_ino)); + } + ++#ifndef Q_OS_WIN ++inline int statWithFsid(const char* path, QT_STATBUF* statBuf) ++{ ++ int ret = QT_LSTAT(path, statBuf); ++ if (ret != 0) { ++ return ret; ++ } ++ ++ struct statvfs fsBuf; ++ ret = statvfs(path, &fsBuf); ++ if (ret == 0 && fsBuf.f_fsid != 0) { ++ // Fold FSID into 32 bits, statBufToId would discard anything else ++ statBuf->st_dev = static_cast(fsBuf.f_fsid ^ (fsBuf.f_fsid >> 32)); ++ } ++ return ret; ++} ++#endif ++ + inline int filePathToStat(const QByteArray& filePath, QT_STATBUF& statBuf) + { + #ifndef Q_OS_WIN +- return QT_LSTAT(filePath.constData(), &statBuf); ++ return statWithFsid(filePath.constData(), &statBuf); + #else + const int ret = QT_STAT(filePath.constData(), &statBuf); + const QString filePathStr = QString::fromUtf8(filePath); From 1097be1524a015bb65063288222bb4dd18aff177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 2 Jul 2023 19:32:19 +0200 Subject: [PATCH 19/35] 5.108.0 --- .gitignore | 1 + kf5-baloo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1bf4518..19e1f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /baloo-5.105.0.tar.xz /baloo-5.106.0.tar.xz /baloo-5.107.0.tar.xz +/baloo-5.108.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index cbfab7f..6ccb7e8 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,8 +9,8 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.107.0 -Release: 2%{?dist} +Version: 5.108.0 +Release: 1%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -209,6 +209,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index e53e5e9..8adba1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.107.0.tar.xz) = f264e0061b375b8afde4f9167d5e08533dac53aef34517476bfe06b9d93d16af459df4394b25b2f1af5f55cf545773d7281ec047ee81d8980ba41cc6a50302c0 +SHA512 (baloo-5.108.0.tar.xz) = 948ee3a955f5c5438c9a0c7fc05432ec85b5ff35c1f37094bb6f3024b68606961a826a6e86233f063aeef4ab9d44435c9515906631c0df919ef616ce911f6828 From 4d2d7088d8eb39745d06d63bc6ef707bf427d9d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:46:50 +0000 Subject: [PATCH 20/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-baloo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 6ccb7e8..57b4777 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -10,7 +10,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.108.0 -Release: 1%{?dist} +Release: 2%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -209,6 +209,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From a00186afbd6d33ca26e4f6ab8cd4930b2779d139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 5 Aug 2023 17:59:28 +0200 Subject: [PATCH 21/35] 5.109.0 --- .gitignore | 1 + kf5-baloo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 19e1f9c..07285c0 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /baloo-5.106.0.tar.xz /baloo-5.107.0.tar.xz /baloo-5.108.0.tar.xz +/baloo-5.109.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 57b4777..c89de4f 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,8 +9,8 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.108.0 -Release: 2%{?dist} +Version: 5.109.0 +Release: 1%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -209,6 +209,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 8adba1f..de4a6b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.108.0.tar.xz) = 948ee3a955f5c5438c9a0c7fc05432ec85b5ff35c1f37094bb6f3024b68606961a826a6e86233f063aeef4ab9d44435c9515906631c0df919ef616ce911f6828 +SHA512 (baloo-5.109.0.tar.xz) = 63e92a9b3fe9b397f8f30bdd96c7ad62f564f2e768d29ab909809ea969a11129545ec53ff49b974946a685ee4010e2c153dc10b5ac6d3a525b912a8b92aed0e4 From 4abd71dba5919d0e21241bdddb299eefdf2428df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Wed, 6 Sep 2023 00:07:06 +0200 Subject: [PATCH 22/35] 5.110.0 --- .gitignore | 1 + kf5-baloo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 07285c0..cdc7783 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /baloo-5.107.0.tar.xz /baloo-5.108.0.tar.xz /baloo-5.109.0.tar.xz +/baloo-5.110.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index c89de4f..faa4a51 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.109.0 +Version: 5.110.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -209,6 +209,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index de4a6b8..8bbc122 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.109.0.tar.xz) = 63e92a9b3fe9b397f8f30bdd96c7ad62f564f2e768d29ab909809ea969a11129545ec53ff49b974946a685ee4010e2c153dc10b5ac6d3a525b912a8b92aed0e4 +SHA512 (baloo-5.110.0.tar.xz) = f5bfd313bb72f57899c3be845dfc699cfcc1c9286733fe0ff5d09cb654b793282dfda8a59a185107686105b7eec2f11b623dbbf1059dd7cb993ceb6295bcc673 From cecfa14db9141f25aa4ca144ea08438c39984745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 10 Oct 2023 22:57:10 +0200 Subject: [PATCH 23/35] 5.111.0 --- .gitignore | 1 + kf5-baloo.spec | 7 +-- sources | 2 +- ...the_device_identifier_where_possible.patch | 43 ------------------- 4 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 use_the_FSID_as_the_device_identifier_where_possible.patch diff --git a/.gitignore b/.gitignore index cdc7783..04a9b02 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /baloo-5.108.0.tar.xz /baloo-5.109.0.tar.xz /baloo-5.110.0.tar.xz +/baloo-5.111.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index faa4a51..8abd05e 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.110.0 +Version: 5.111.0 Release: 1%{?dist} # libs are LGPL, tools are GPL @@ -30,8 +30,6 @@ Source2: baloo_file_shutdown.sh ## upstreamable patches # http://bugzilla.redhat.com/1235026 Patch100: baloo-5.67.0-baloofile_config.patch -# https://invent.kde.org/frameworks/baloo/-/merge_requests/131 -Patch101: use_the_FSID_as_the_device_identifier_where_possible.patch ## upstream patches @@ -209,6 +207,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 8bbc122..cd5bafa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.110.0.tar.xz) = f5bfd313bb72f57899c3be845dfc699cfcc1c9286733fe0ff5d09cb654b793282dfda8a59a185107686105b7eec2f11b623dbbf1059dd7cb993ceb6295bcc673 +SHA512 (baloo-5.111.0.tar.xz) = 81a1dfb265e564b33d8c9440d0b71438db6ff244a9081b431180e4d730f77c1cdf4f67258f587c846bae58ae34106fd1df5f93617c1f0f81543c657a00c6e03a diff --git a/use_the_FSID_as_the_device_identifier_where_possible.patch b/use_the_FSID_as_the_device_identifier_where_possible.patch deleted file mode 100644 index 89ce3cd..0000000 --- a/use_the_FSID_as_the_device_identifier_where_possible.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/engine/idutils.h b/src/engine/idutils.h -index 78d881a96e894d731ba024acc8cc74b47823c96b..606ac9dca0a647fcc78ffb031c081201fbb1a491 100644 ---- a/src/engine/idutils.h -+++ b/src/engine/idutils.h -@@ -13,6 +13,8 @@ - - #ifdef Q_OS_WIN - # include -+#else -+# include - #endif - - namespace Baloo { -@@ -40,10 +42,28 @@ inline quint64 statBufToId(const QT_STATBUF& stBuf) - static_cast(stBuf.st_ino)); - } - -+#ifndef Q_OS_WIN -+inline int statWithFsid(const char* path, QT_STATBUF* statBuf) -+{ -+ int ret = QT_LSTAT(path, statBuf); -+ if (ret != 0) { -+ return ret; -+ } -+ -+ struct statvfs fsBuf; -+ ret = statvfs(path, &fsBuf); -+ if (ret == 0 && fsBuf.f_fsid != 0) { -+ // Fold FSID into 32 bits, statBufToId would discard anything else -+ statBuf->st_dev = static_cast(fsBuf.f_fsid ^ (fsBuf.f_fsid >> 32)); -+ } -+ return ret; -+} -+#endif -+ - inline int filePathToStat(const QByteArray& filePath, QT_STATBUF& statBuf) - { - #ifndef Q_OS_WIN -- return QT_LSTAT(filePath.constData(), &statBuf); -+ return statWithFsid(filePath.constData(), &statBuf); - #else - const int ret = QT_STAT(filePath.constData(), &statBuf); - const QString filePathStr = QString::fromUtf8(filePath); From 22bc5b2661674547dfddcb83f43157c5ad458e17 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Fri, 13 Oct 2023 01:02:25 +0200 Subject: [PATCH 24/35] Add KF6 compatibility flag --- kf5-baloo.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 8abd05e..b21fbbc 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -1,3 +1,5 @@ +%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] + %global framework baloo # uncomment to enable bootstrap mode @@ -10,7 +12,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.111.0 -Release: 1%{?dist} +Release: 2%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -115,7 +117,8 @@ License: LGPLv2 or LGPLv3 %build %{cmake_kf5} \ - -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} + -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \ + %{?with_kf6_compat:-DBUILD_INDEXER_SERVICE=OFF} %cmake_build @@ -129,8 +132,10 @@ find %{buildroot} -name kde-baloo.service -delete # 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 @@ -167,10 +172,13 @@ 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}* %files file -f %{name}-file.lang +%if %{without kf6_compat} %{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf %config(noreplace) %{_sysconfdir}/xdg/plasma-workspace/shutdown/baloo_file.sh %{_kf5_bindir}/baloo_file @@ -181,6 +189,7 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %endif %{_libexecdir}/baloo_file %{_libexecdir}/baloo_file_extractor +%endif %ldconfig_scriptlets libs @@ -202,11 +211,16 @@ 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 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 From c75228fd5a63747ed136d8607f10e0a36992b0f5 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Mon, 16 Oct 2023 23:53:56 +0200 Subject: [PATCH 25/35] Require kf6-baloo if compat build --- kf5-baloo.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index b21fbbc..2241cf8 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.111.0 -Release: 2%{?dist} +Release: 3%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted @@ -99,6 +99,9 @@ Provides: baloo-file = %{version}-%{release} %else Conflicts: baloo-file < 5 %endif +%if %{with kf6_compat} +Requires: kf6-baloo-file%{?_isa} +%endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description file %{summary}. @@ -218,6 +221,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From 038204d21822f070d4907b1503f6fe5b5969babf Mon Sep 17 00:00:00 2001 From: Steve Cossette Date: Fri, 27 Oct 2023 20:30:18 -0400 Subject: [PATCH 26/35] Updated spec with SPDX licenses --- kf5-baloo.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 2241cf8..b7a2340 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -14,9 +14,7 @@ Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search func Version: 5.111.0 Release: 3%{?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://invent.kde.org/frameworks/%{framework} From 082cf730662ba92874d5b4fd79e3db5c2f7f0e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Fri, 8 Dec 2023 21:24:41 +0100 Subject: [PATCH 27/35] 5.113.0 --- .gitignore | 1 + kf5-baloo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 04a9b02..1b076e2 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /baloo-5.109.0.tar.xz /baloo-5.110.0.tar.xz /baloo-5.111.0.tar.xz +/baloo-5.113.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index b7a2340..d15911b 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -11,8 +11,8 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.111.0 -Release: 3%{?dist} +Version: 5.113.0 +Release: 1%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -219,6 +219,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index cd5bafa..f1944f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.111.0.tar.xz) = 81a1dfb265e564b33d8c9440d0b71438db6ff244a9081b431180e4d730f77c1cdf4f67258f587c846bae58ae34106fd1df5f93617c1f0f81543c657a00c6e03a +SHA512 (baloo-5.113.0.tar.xz) = b123af0e1df704c915e874eac3a63e65a1e8b85382d8890c5c66c05bf088b732e9234278bcb0bc8c7e47a26d638012d9697484da53f8414479b71ec2afbd4060 From 25a464425221f06a91d9c3b4efc3f6af06365f53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 00:19:08 +0000 Subject: [PATCH 28/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- kf5-baloo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index d15911b..d2aecd2 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.113.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -219,6 +219,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From dc8e27f13df57152b3df51d4f3fb23e83ffe3f76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:59:10 +0000 Subject: [PATCH 29/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- kf5-baloo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index d2aecd2..a46973e 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.113.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -219,6 +219,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From e9b5dcb1359792981415a8928f11badfc5b5523f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 10 Feb 2024 18:34:24 +0100 Subject: [PATCH 30/35] 5.115.0 --- .gitignore | 1 + kf5-baloo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1b076e2..3c572f1 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /baloo-5.110.0.tar.xz /baloo-5.111.0.tar.xz /baloo-5.113.0.tar.xz +/baloo-5.115.0.tar.xz diff --git a/kf5-baloo.spec b/kf5-baloo.spec index a46973e..4efbf51 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -11,8 +11,8 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.113.0 -Release: 3%{?dist} +Version: 5.115.0 +Release: 1%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -219,6 +219,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index f1944f9..09b6450 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.113.0.tar.xz) = b123af0e1df704c915e874eac3a63e65a1e8b85382d8890c5c66c05bf088b732e9234278bcb0bc8c7e47a26d638012d9697484da53f8414479b71ec2afbd4060 +SHA512 (baloo-5.115.0.tar.xz) = 43130d873845a3d8f0a7a25b04a032e7cd834170b5f67b7b18396a800086801ce0910865dc7efc333dd0764121b65c8fddcec4e072af6503e0b1bc55c642f4d6 From 2aa474c17408793e44197d284b7745502c03c5b1 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Thu, 22 Feb 2024 16:37:30 +0100 Subject: [PATCH 31/35] Drop kf5-baloo-file subpackage, obsoleted by kf6-baloo-file --- kf5-baloo.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 4efbf51..1f782e7 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.115.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -87,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 @@ -97,12 +98,10 @@ Provides: baloo-file = %{version}-%{release} %else Conflicts: baloo-file < 5 %endif -%if %{with kf6_compat} -Requires: kf6-baloo-file%{?_isa} -%endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description file %{summary}. +%endif %package libs Summary: Runtime libraries for %{name} @@ -157,6 +156,10 @@ cat kio5_tags.lang kio5_baloosearch.lang kio5_timeline.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} @@ -178,8 +181,8 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %endif %{_kf5_datadir}/qlogging-categories5/%{framework}* -%files file -f %{name}-file.lang %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 @@ -219,6 +222,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From 076015ca6545389648df1d7178270f3a8fb66ccf Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sun, 19 May 2024 19:20:45 +0200 Subject: [PATCH 32/35] 5.116.0 --- .gitignore | 1 + kf5-baloo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3c572f1..7ad8a59 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /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 1f782e7..e20f5dd 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -11,8 +11,8 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality -Version: 5.115.0 -Release: 2%{?dist} +Version: 5.116.0 +Release: 1%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -222,6 +222,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 diff --git a/sources b/sources index 09b6450..ed77600 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (baloo-5.115.0.tar.xz) = 43130d873845a3d8f0a7a25b04a032e7cd834170b5f67b7b18396a800086801ce0910865dc7efc333dd0764121b65c8fddcec4e072af6503e0b1bc55c642f4d6 +SHA512 (baloo-5.116.0.tar.xz) = 956a07009fa83f852fa88a7bcabffc73343072e30650cc7000e385f73e467aa2c7c440b41715405fc0a59d68ad8e533c2587e06de8475f24b49e1fa35d8b2486 From d4d05819b2fa1de1623b866b064f092bcb548900 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:43:30 +0000 Subject: [PATCH 33/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- kf5-baloo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index e20f5dd..011c036 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.116.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -222,6 +222,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From 623e13422768114289724010d4a546694a08f6e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:42:56 +0000 Subject: [PATCH 34/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- kf5-baloo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index 011c036..f246de6 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.116.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -222,6 +222,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* 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 From a86ff65a205fef34563dfafc2af7c251cc5bd0bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:25:43 +0000 Subject: [PATCH 35/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- kf5-baloo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index f246de6..a187e19 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.116.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later URL: https://community.kde.org/Baloo @@ -222,6 +222,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %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