From 08954064fd41d19a8eba5656acc2aa80ab60d515 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 28 Nov 2021 11:52:05 +0100 Subject: [PATCH 01/67] 1.31.4 --- .gitignore | 1 + recoll-1.31.0-kio.patch | 25 ------------------------- recoll.spec | 10 +++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 recoll-1.31.0-kio.patch diff --git a/.gitignore b/.gitignore index f0e6b22..0c923c2 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ recoll-1.13.04.tar.gz /recoll-1.30.1.tar.gz /recoll-1.31.0.tar.gz /gssp-recoll-1.1.1.tar.gz +/recoll-1.31.4.tar.gz diff --git a/recoll-1.31.0-kio.patch b/recoll-1.31.0-kio.patch deleted file mode 100644 index 27912e9..0000000 --- a/recoll-1.31.0-kio.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/kde/kioslave/kio_recoll-kde4/CMakeLists.txt b/kde/kioslave/kio_recoll-kde4/CMakeLists.txt -index 29435cf..9756691 100644 ---- a/kde/kioslave/kio_recoll-kde4/CMakeLists.txt -+++ b/kde/kioslave/kio_recoll-kde4/CMakeLists.txt -@@ -60,7 +60,7 @@ add_custom_target(rcllib - ) - add_dependencies(kio_recoll rcllib) - --target_link_libraries(kio_recoll recoll xapian xslt xml2 z ${EXTRA_LIBS} ${KDE4_KIO_LIBS}) -+target_link_libraries(kio_recoll recoll xapian xslt xml2 z ${EXTRA_LIBS} ${KDE4_KIO_LIBS} X11) - - install(TARGETS kio_recoll DESTINATION ${PLUGIN_INSTALL_DIR}) - -diff --git a/kde/kioslave/kio_recoll/CMakeLists.txt b/kde/kioslave/kio_recoll/CMakeLists.txt -index ca10542..14f426f 100644 ---- a/kde/kioslave/kio_recoll/CMakeLists.txt -+++ b/kde/kioslave/kio_recoll/CMakeLists.txt -@@ -85,6 +85,7 @@ xapian - xslt - xml2 - KF5::KIOCore -+X11 - dl - z - pthread diff --git a/recoll.spec b/recoll.spec index 781bab0..8b5253d 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,8 +2,8 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.31.0 -Release: 4%{?dist} +Version: 1.31.4 +Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -11,7 +11,6 @@ Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gs Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch Patch02: recoll-1.25.20-py3-only.patch -Patch03: recoll-1.31.0-kio.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -141,6 +140,8 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_mandir}/man1/%{name}index.1* %{_mandir}/man1/xadump.1* %{_mandir}/man5/%{name}.conf.5* +%{_unitdir}/recollindex@.service +%{_userunitdir}/recollindex.service %files kio %license COPYING @@ -162,6 +163,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Nov 28 2021 Terje Rosten - 1.31.4-1 +- 1.31.4 + * Thu Sep 23 2021 Terje Rosten - 1.31.0-4 - GSSP 1.1.1 diff --git a/sources b/sources index bcdb2eb..ecbf32c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.31.0.tar.gz) = 1a740cdabab158737461ab8f097ece79844e1f0b64285871217049c0619df400d99db18eac8942e1986def555c5ab8364f3320eb403d150b061126cbc3be2116 +SHA512 (recoll-1.31.4.tar.gz) = d088aa056abe9b12c7a10486e55ab71400b933699cd27593861066abd866f8bac1acf9d7ed26399d485a9d3903632556e32b1177d78fb06e9ac841377121fce7 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From b74e991a5f2256d865fdc244e648211fceb131d9 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Thu, 24 Feb 2022 13:30:32 +0100 Subject: [PATCH 02/67] 1.31.6 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0c923c2..28f6e90 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ recoll-1.13.04.tar.gz /recoll-1.31.0.tar.gz /gssp-recoll-1.1.1.tar.gz /recoll-1.31.4.tar.gz +/recoll-1.31.6.tar.gz diff --git a/recoll.spec b/recoll.spec index 8b5253d..f322af7 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.31.4 +Version: 1.31.6 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -163,6 +163,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Thu Feb 24 2022 Terje Rosten - 1.31.6-1 +- 1.31.6 + * Sun Nov 28 2021 Terje Rosten - 1.31.4-1 - 1.31.4 diff --git a/sources b/sources index ecbf32c..a67710f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.31.4.tar.gz) = d088aa056abe9b12c7a10486e55ab71400b933699cd27593861066abd866f8bac1acf9d7ed26399d485a9d3903632556e32b1177d78fb06e9ac841377121fce7 +SHA512 (recoll-1.31.6.tar.gz) = 5f20efee20b01ba9516307936ca45182aa3af88b0be3d44aebfde261c223c0638650e3292c93443afef20ba5060ecfbbe2bc1c7470fd004dea4c01252947f7e1 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From b3272d2030752cccd3adce4cde81aefdd8caa15c Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sat, 26 Feb 2022 18:00:01 +0100 Subject: [PATCH 03/67] Add patch to fix KIO build --- recoll-1.31.6-kio.patch | 11 +++++++++++ recoll.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recoll-1.31.6-kio.patch diff --git a/recoll-1.31.6-kio.patch b/recoll-1.31.6-kio.patch new file mode 100644 index 0000000..fd4cca9 --- /dev/null +++ b/recoll-1.31.6-kio.patch @@ -0,0 +1,11 @@ +--- recoll-1.31.6/kde/kioslave/kio_recoll/dirif.cpp~ 2021-12-18 19:09:04.000000000 +0100 ++++ recoll-1.31.6/kde/kioslave/kio_recoll/dirif.cpp 2022-02-26 17:42:44.851348227 +0100 +@@ -35,7 +35,7 @@ + #include + #include + #include +-#include ++#include + + #include "kio_recoll.h" + #include "pathut.h" diff --git a/recoll.spec b/recoll.spec index f322af7..d5606b6 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.31.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -11,6 +11,7 @@ Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gs Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch Patch02: recoll-1.25.20-py3-only.patch +Patch03: recoll-1.31.6-kio.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -163,6 +164,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Thu Feb 24 2022 Terje Rosten - 1.31.6-2 +- Add patch to fix KIO build + * Thu Feb 24 2022 Terje Rosten - 1.31.6-1 - 1.31.6 From 24c481ded92c6e231e6ff1dd916709d5bdcf600b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:36:29 +0200 Subject: [PATCH 04/67] Rebuilt for Python 3.11 --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index d5606b6..e29da66 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.31.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -164,6 +164,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Jun 13 2022 Python Maint - 1.31.6-3 +- Rebuilt for Python 3.11 + * Thu Feb 24 2022 Terje Rosten - 1.31.6-2 - Add patch to fix KIO build From 5d2bf2b94ae9ef94efab25e97f9be3803d6bf4c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 00:37:43 +0000 Subject: [PATCH 05/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index e29da66..5806296 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.31.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -164,6 +164,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.31.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1.31.6-3 - Rebuilt for Python 3.11 From d1bae5641cc95a7b52147c50f63826bfc855a978 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 28 Aug 2022 18:44:45 +0200 Subject: [PATCH 06/67] 1.32.7 --- .gitignore | 1 + recoll-1.31.6-kio.patch | 11 ----------- recoll.spec | 12 ++++++------ sources | 2 +- 4 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 recoll-1.31.6-kio.patch diff --git a/.gitignore b/.gitignore index 28f6e90..eae71d5 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ recoll-1.13.04.tar.gz /gssp-recoll-1.1.1.tar.gz /recoll-1.31.4.tar.gz /recoll-1.31.6.tar.gz +/recoll-1.32.7.tar.gz diff --git a/recoll-1.31.6-kio.patch b/recoll-1.31.6-kio.patch deleted file mode 100644 index fd4cca9..0000000 --- a/recoll-1.31.6-kio.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- recoll-1.31.6/kde/kioslave/kio_recoll/dirif.cpp~ 2021-12-18 19:09:04.000000000 +0100 -+++ recoll-1.31.6/kde/kioslave/kio_recoll/dirif.cpp 2022-02-26 17:42:44.851348227 +0100 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - - #include "kio_recoll.h" - #include "pathut.h" diff --git a/recoll.spec b/recoll.spec index 5806296..6ab52fa 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,8 +2,8 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.31.6 -Release: 4%{?dist} +Version: 1.32.7 +Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -11,7 +11,6 @@ Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gs Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch Patch02: recoll-1.25.20-py3-only.patch -Patch03: recoll-1.31.6-kio.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -147,14 +146,12 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %files kio %license COPYING %{_libdir}/kde4/kio_recoll.so -%{_libdir}/qt5/plugins/kio_recoll.so +%{_libdir}/qt5/plugins/kf5/kio/kio_recoll.so %{_datadir}/kde4/apps/kio_recoll/ %{_datadir}/kde4/services/recoll.protocol %{_datadir}/kde4/services/recollf.protocol %{_datadir}/kio_recoll/help.html %{_datadir}/kio_recoll/welcome.html -%{_datadir}/kservices5/recoll.protocol -%{_datadir}/kservices5/recollf.protocol %files gssp %license COPYING @@ -164,6 +161,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Aug 27 2022 Terje Rosten - 1.32.7-1 +- 1.32.7 + * Sat Jul 23 2022 Fedora Release Engineering - 1.31.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index a67710f..de314e8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.31.6.tar.gz) = 5f20efee20b01ba9516307936ca45182aa3af88b0be3d44aebfde261c223c0638650e3292c93443afef20ba5060ecfbbe2bc1c7470fd004dea4c01252947f7e1 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 +SHA512 (recoll-1.32.7.tar.gz) = c75fd267b1257201ffc85bb6d34cde3909e5c19fd7dad033b570f4e34d92a3f0430df30ca734051a35f37e158a572d11b73ac173be40a09ea8bf24c346100f42 From 0f4bc29ccf7b991808494c3c2adee2f650558ce4 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 23 Oct 2022 22:45:51 +0200 Subject: [PATCH 07/67] 1.33.1 --- .gitignore | 1 + recoll.spec | 37 ++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index eae71d5..b5263bd 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ recoll-1.13.04.tar.gz /recoll-1.31.4.tar.gz /recoll-1.31.6.tar.gz /recoll-1.32.7.tar.gz +/recoll-1.33.1.tar.gz diff --git a/recoll.spec b/recoll.spec index 6ab52fa..2a58db1 100644 --- a/recoll.spec +++ b/recoll.spec @@ -1,8 +1,8 @@ -%global gsspver 1.1.1 +%global gsspver 1.1.1 Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.32.7 +Version: 1.33.1 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -10,7 +10,6 @@ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch -Patch02: recoll-1.25.20-py3-only.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -111,7 +110,7 @@ make install DESTDIR=%{buildroot} popd mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arch}.conf %py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/filters/ @@ -121,25 +120,26 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %files %license COPYING %doc ChangeLog README -%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%{_bindir}/%{name} -%{_bindir}/%{name}index -%{_bindir}/%{name}q -%{_datadir}/%{name} -%{_datadir}/metainfo/%{name}.appdata.xml -%{_datadir}/applications/%{name}-searchgui.desktop -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%{_datadir}/pixmaps/%{name}.png +%{_sysconfdir}/ld.so.conf.d/recoll-%{_arch}.conf +%{_bindir}/recoll +%{_bindir}/recollindex +%{_bindir}/recollq +%{_datadir}/recoll +%{_datadir}/metainfo/recoll.appdata.xml +%{_datadir}/applications/recoll-searchgui.desktop +%{_datadir}/icons/hicolor/48x48/apps/recoll.png +%{_datadir}/pixmaps/recoll.png %{_libdir}/recoll %{python3_sitearch}/recoll %{python3_sitearch}/recollchm %{python3_sitearch}/Recoll-*.egg-info %{python3_sitearch}/recollchm-*.egg-info -%{_mandir}/man1/%{name}.1* -%{_mandir}/man1/%{name}q.1* -%{_mandir}/man1/%{name}index.1* +%{_mandir}/man1/recoll.1* +%{_mandir}/man1/recollq.1* +%{_mandir}/man1/recollindex.1* +%{_mandir}/man1/rclgrep.1* %{_mandir}/man1/xadump.1* -%{_mandir}/man5/%{name}.conf.5* +%{_mandir}/man5/recoll.conf.5* %{_unitdir}/recollindex@.service %{_userunitdir}/recollindex.service @@ -161,6 +161,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Oct 23 2022 Terje Rosten - 1.33.1-1 +- 1.33.1 + * Sat Aug 27 2022 Terje Rosten - 1.32.7-1 - 1.32.7 diff --git a/sources b/sources index de314e8..89bc68d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 -SHA512 (recoll-1.32.7.tar.gz) = c75fd267b1257201ffc85bb6d34cde3909e5c19fd7dad033b570f4e34d92a3f0430df30ca734051a35f37e158a572d11b73ac173be40a09ea8bf24c346100f42 +SHA512 (recoll-1.33.1.tar.gz) = 456e0c7354422a122def086f353a7529328de192760d12600de4e35ce6d068a89f2aa696fb520ec7f601e702b7ce7f0adac77f495c48b50019afb9fbc2a512f1 From b15cf084e09fc91747173e980cd85f5bf226ec9f Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sat, 12 Nov 2022 17:55:43 +0100 Subject: [PATCH 08/67] 1.33.2 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b5263bd..62d04af 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ recoll-1.13.04.tar.gz /recoll-1.31.6.tar.gz /recoll-1.32.7.tar.gz /recoll-1.33.1.tar.gz +/recoll-1.33.2.tar.gz diff --git a/recoll.spec b/recoll.spec index 2a58db1..a7699b0 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.33.1 +Version: 1.33.2 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -161,6 +161,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Nov 12 2022 Terje Rosten - 1.33.2-1 +- 1.33.2 + * Sun Oct 23 2022 Terje Rosten - 1.33.1-1 - 1.33.1 diff --git a/sources b/sources index 89bc68d..0e3bb18 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 -SHA512 (recoll-1.33.1.tar.gz) = 456e0c7354422a122def086f353a7529328de192760d12600de4e35ce6d068a89f2aa696fb520ec7f601e702b7ce7f0adac77f495c48b50019afb9fbc2a512f1 +SHA512 (recoll-1.33.2.tar.gz) = 13708a2e62f643495fd0952962f831695fdb17126e8d6352f77f2a2111903812f1557316714990449481ad36c3139de2484eb49b8cc15429d6919ae454043401 From ba437ec115a69e105d1f25d6f384189cddc80bdd Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sat, 10 Dec 2022 18:40:35 +0100 Subject: [PATCH 09/67] 1.33.3 --- .gitignore | 1 + recoll.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 62d04af..9d9ca71 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ recoll-1.13.04.tar.gz /recoll-1.32.7.tar.gz /recoll-1.33.1.tar.gz /recoll-1.33.2.tar.gz +/recoll-1.33.3.tar.gz diff --git a/recoll.spec b/recoll.spec index a7699b0..1de831f 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.33.2 +Version: 1.33.3 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -137,8 +137,8 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_mandir}/man1/recoll.1* %{_mandir}/man1/recollq.1* %{_mandir}/man1/recollindex.1* -%{_mandir}/man1/rclgrep.1* -%{_mandir}/man1/xadump.1* +#{_mandir}/man1/rclgrep.1* +#{_mandir}/man1/xadump.1* %{_mandir}/man5/recoll.conf.5* %{_unitdir}/recollindex@.service %{_userunitdir}/recollindex.service @@ -161,6 +161,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Nov 28 2022 Terje Rosten - 1.33.3-1 +- 1.33.3 + * Sat Nov 12 2022 Terje Rosten - 1.33.2-1 - 1.33.2 diff --git a/sources b/sources index 0e3bb18..0a7a664 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (recoll-1.33.3.tar.gz) = f3a8876b0d0e19415baf76d8fb8d26fefb8e66185d5aea5bd316d7f2b08d0e49a6d5d524a6e76455972a9ea44200fdf3f35fe0695aacfa99cc08edda8a81f623 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 -SHA512 (recoll-1.33.2.tar.gz) = 13708a2e62f643495fd0952962f831695fdb17126e8d6352f77f2a2111903812f1557316714990449481ad36c3139de2484eb49b8cc15429d6919ae454043401 From cbc45d886f826278cf1485ac2900b317d1bf1fa6 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Wed, 18 Jan 2023 20:08:00 +0100 Subject: [PATCH 10/67] 1.34.0 --- .gitignore | 1 + recoll.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9d9ca71..410ae1b 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ recoll-1.13.04.tar.gz /recoll-1.33.1.tar.gz /recoll-1.33.2.tar.gz /recoll-1.33.3.tar.gz +/recoll-1.34.0.tar.gz diff --git a/recoll.spec b/recoll.spec index 1de831f..453905c 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.33.3 +Version: 1.34.0 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -134,6 +134,8 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{python3_sitearch}/recollchm %{python3_sitearch}/Recoll-*.egg-info %{python3_sitearch}/recollchm-*.egg-info +%{python3_sitearch}/aspell.cpython-*-linux-gnu.so +%{python3_sitearch}/aspell_python_py3-*.egg-info %{_mandir}/man1/recoll.1* %{_mandir}/man1/recollq.1* %{_mandir}/man1/recollindex.1* @@ -161,6 +163,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Wed Jan 18 2023 Terje Rosten - 1.34.0-1 +- 1.34.0 + * Mon Nov 28 2022 Terje Rosten - 1.33.3-1 - 1.33.3 diff --git a/sources b/sources index 0a7a664..9d3a315 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.33.3.tar.gz) = f3a8876b0d0e19415baf76d8fb8d26fefb8e66185d5aea5bd316d7f2b08d0e49a6d5d524a6e76455972a9ea44200fdf3f35fe0695aacfa99cc08edda8a81f623 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 +SHA512 (recoll-1.34.0.tar.gz) = 1adcb65ab23dde5ea8b0dcb8779c0c4917f6e6f1bba10afafd43baf74130ca75407aa296a5a93d944c647eca6ef527a4a1a15f025175d34dede564dacce98b69 From d905bd15c31a555bba278d7ecd30ae1ab863ef5b Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Thu, 26 Jan 2023 20:08:51 +0100 Subject: [PATCH 11/67] 1.34.2 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 410ae1b..3266762 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ recoll-1.13.04.tar.gz /recoll-1.33.2.tar.gz /recoll-1.33.3.tar.gz /recoll-1.34.0.tar.gz +/recoll-1.34.2.tar.gz diff --git a/recoll.spec b/recoll.spec index 453905c..42cb45f 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.34.0 +Version: 1.34.2 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -163,6 +163,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Thu Jan 26 2023 Terje Rosten - 1.34.2-1 +- 1.34.2 + * Wed Jan 18 2023 Terje Rosten - 1.34.0-1 - 1.34.0 diff --git a/sources b/sources index 9d3a315..571a48f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (recoll-1.34.2.tar.gz) = c0fc559d0c2edb353f5445709ba870ef5f7454819b5bbfa27e1ed15dd841131f551508434a40b95da9e478d1ae555d81479db2b4b05cad96816393b0480f2afd SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 -SHA512 (recoll-1.34.0.tar.gz) = 1adcb65ab23dde5ea8b0dcb8779c0c4917f6e6f1bba10afafd43baf74130ca75407aa296a5a93d944c647eca6ef527a4a1a15f025175d34dede564dacce98b69 From 2918fac2c7b2884a1053746b16408a351dcd6112 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 29 Jan 2023 17:26:55 +0100 Subject: [PATCH 12/67] On arm32 file name is aspell.cpython-3*-arm-linux-gnueabihf.so --- recoll.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recoll.spec b/recoll.spec index 42cb45f..fd451a2 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.34.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -134,7 +134,7 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{python3_sitearch}/recollchm %{python3_sitearch}/Recoll-*.egg-info %{python3_sitearch}/recollchm-*.egg-info -%{python3_sitearch}/aspell.cpython-*-linux-gnu.so +%{python3_sitearch}/aspell.cpython-*-linux-gnu*.so %{python3_sitearch}/aspell_python_py3-*.egg-info %{_mandir}/man1/recoll.1* %{_mandir}/man1/recollq.1* @@ -163,6 +163,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Jan 29 2023 Terje Rosten - 1.34.2-2 +- Fix file pattern to cover arm32 platform + * Thu Jan 26 2023 Terje Rosten - 1.34.2-1 - 1.34.2 From 7141aa62034d466d5b6e688f7d3974b76d833924 Mon Sep 17 00:00:00 2001 From: bzs Date: Thu, 16 Feb 2023 18:26:44 +0100 Subject: [PATCH 13/67] build and package recoll-krunner - implement bz#2170512 --- recoll.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/recoll.spec b/recoll.spec index fd451a2..079ded2 100644 --- a/recoll.spec +++ b/recoll.spec @@ -19,6 +19,12 @@ BuildRequires: gcc-c++ # kio BuildRequires: kdelibs4-devel BuildRequires: kf5-kio-devel +# krunner +BuildRequires: kf5-ki18n-devel +BuildRequires: kf5-krunner-devel +BuildRequires: kf5-knotifications-devel +BuildRequires: kf5-kpackage-devel + BuildRequires: libxslt-devel BuildRequires: make BuildRequires: python-rpm-macros @@ -45,6 +51,13 @@ The recoll KIO slave allows performing a recoll search by entering an appropriate URL in a KDE open dialog, or with an HTML-based interface displayed in Konqueror. +%package krunner +Summary: KRunner support for recoll +Requires: %{name} = %{version}-%{release} + +%description krunner +The recoll KRunner plugin adds Recoll search results to KRunner output. + %package gssp Summary: Recoll GNOME Shell search provider Requires: %{name} = %{version}-%{release} @@ -104,6 +117,13 @@ pushd kde/kioslave/kio_recoll-kde4 %cmake_install popd +# krunner_recoll +pushd kde/krunner +%cmake +%cmake_build +%cmake_install +popd + # gssp pushd gssp make install DESTDIR=%{buildroot} @@ -155,6 +175,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/kio_recoll/help.html %{_datadir}/kio_recoll/welcome.html +%files krunner +%{_libdir}/qt5/plugins/kf5/krunner/runner_recoll.so + %files gssp %license COPYING %{_bindir}/gssp-recoll.py From d2e25d30faf1b96fb250aece1fe3cdf411ef8617 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 19 Feb 2023 17:35:34 +0100 Subject: [PATCH 14/67] Add changelog --- recoll.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recoll.spec b/recoll.spec index 079ded2..1f3ca7c 100644 --- a/recoll.spec +++ b/recoll.spec @@ -186,6 +186,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Feb 19 2023 bzs - 1.34.2-3 +- Add krunner (rhbz#2170512) + * Sun Jan 29 2023 Terje Rosten - 1.34.2-2 - Fix file pattern to cover arm32 platform From 4ce96c2414c632a266a58b50f7381099cc829864 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 19 Feb 2023 17:55:57 +0100 Subject: [PATCH 15/67] Bump release --- recoll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 1f3ca7c..88a6a17 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.34.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz From 6f58f6d718d7eccba081296f58e1cfbc5f9d7de7 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 19 Feb 2023 18:23:23 +0100 Subject: [PATCH 16/67] 1.34.3 --- .gitignore | 1 + recoll.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3266762..ef289e3 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ recoll-1.13.04.tar.gz /recoll-1.33.3.tar.gz /recoll-1.34.0.tar.gz /recoll-1.34.2.tar.gz +/recoll-1.34.3.tar.gz diff --git a/recoll.spec b/recoll.spec index 88a6a17..86826d6 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,8 +2,8 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.34.2 -Release: 3%{?dist} +Version: 1.34.3 +Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -154,8 +154,8 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{python3_sitearch}/recollchm %{python3_sitearch}/Recoll-*.egg-info %{python3_sitearch}/recollchm-*.egg-info -%{python3_sitearch}/aspell.cpython-*-linux-gnu*.so -%{python3_sitearch}/aspell_python_py3-*.egg-info +%{python3_sitearch}/recollaspell.cpython-*-linux-gnu*.so +%{python3_sitearch}/recoll_aspell_python_py3-*.egg-info %{_mandir}/man1/recoll.1* %{_mandir}/man1/recollq.1* %{_mandir}/man1/recollindex.1* @@ -186,6 +186,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Feb 19 2023 Terje Rosten - 1.34.3-1 +- 1.34.3 + * Sun Feb 19 2023 bzs - 1.34.2-3 - Add krunner (rhbz#2170512) diff --git a/sources b/sources index 571a48f..5906cc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.34.2.tar.gz) = c0fc559d0c2edb353f5445709ba870ef5f7454819b5bbfa27e1ed15dd841131f551508434a40b95da9e478d1ae555d81479db2b4b05cad96816393b0480f2afd +SHA512 (recoll-1.34.3.tar.gz) = 11ba40b8367105fc0190d8cb8eb0596e915e978a96fa2f8f0a2a48b82b3a6b3d170b1446b659ea23279f05d71e997c4fdaebe11290a844238c46044f51340d78 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From c83e929bf748b533c8d74b386f7db884c7ff6562 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 5 Mar 2023 18:49:13 +0100 Subject: [PATCH 17/67] 1.34.5 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ef289e3..7cc02e6 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ recoll-1.13.04.tar.gz /recoll-1.34.0.tar.gz /recoll-1.34.2.tar.gz /recoll-1.34.3.tar.gz +/recoll-1.34.5.tar.gz diff --git a/recoll.spec b/recoll.spec index 86826d6..9abd092 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.34.3 +Version: 1.34.5 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -186,6 +186,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Mar 05 2023 Terje Rosten - 1.34.5-1 +- 1.34.5 + * Sun Feb 19 2023 Terje Rosten - 1.34.3-1 - 1.34.3 diff --git a/sources b/sources index 5906cc9..56c3123 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.34.3.tar.gz) = 11ba40b8367105fc0190d8cb8eb0596e915e978a96fa2f8f0a2a48b82b3a6b3d170b1446b659ea23279f05d71e997c4fdaebe11290a844238c46044f51340d78 +SHA512 (recoll-1.34.5.tar.gz) = 5732ed549c79a11f4e2fda7d2e72782fb6ee7d3afca19ad658a5206820795dbd5488e6575aca1101ac72d8dcaced4b88ce48689d5895e335a82a840236bac479 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From 1d96b7dbbd04303f1ac364c244a35e1b9bd40424 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 26 Mar 2023 20:17:57 +0200 Subject: [PATCH 18/67] 1.34.6 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7cc02e6..5fe2fed 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ recoll-1.13.04.tar.gz /recoll-1.34.2.tar.gz /recoll-1.34.3.tar.gz /recoll-1.34.5.tar.gz +/recoll-1.34.6.tar.gz diff --git a/recoll.spec b/recoll.spec index 9abd092..c21bfa4 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.34.5 +Version: 1.34.6 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -186,6 +186,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Mar 26 2023 Terje Rosten - 1.34.6-1 +- 1.34.6 + * Sun Mar 05 2023 Terje Rosten - 1.34.5-1 - 1.34.5 diff --git a/sources b/sources index 56c3123..2fb070a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.34.5.tar.gz) = 5732ed549c79a11f4e2fda7d2e72782fb6ee7d3afca19ad658a5206820795dbd5488e6575aca1101ac72d8dcaced4b88ce48689d5895e335a82a840236bac479 +SHA512 (recoll-1.34.6.tar.gz) = f151a8f3575af41277fc9b50bb9a5e2ea1348e035b3dead36b47d1d6918deb755a4d59913d174db48273afdd95f4a063aa20219f1116a6d83c82fb063dbf16b7 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From 51a66506d8158e53da37bffd231fdf64cfcfeccc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:58:34 +0200 Subject: [PATCH 19/67] Rebuilt for Python 3.12 --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index c21bfa4..92b621d 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.34.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -186,6 +186,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Tue Jun 13 2023 Python Maint - 1.34.6-2 +- Rebuilt for Python 3.12 + * Sun Mar 26 2023 Terje Rosten - 1.34.6-1 - 1.34.6 From dfda2354119e754f4c98196eb426cccd649d23ae Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 25 Jun 2023 18:13:16 +0200 Subject: [PATCH 20/67] 1.34.7 Add patch from upstream to fix bz#2213017 and bz#2203626 --- .gitignore | 1 + ...dfd8c25f3a5429fbc8988758e2fa00c3833f.patch | 30 ++++++++++++++++ recoll-1.25.20-py3-only.patch | 36 ------------------- recoll.spec | 9 +++-- sources | 2 +- 5 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch delete mode 100644 recoll-1.25.20-py3-only.patch diff --git a/.gitignore b/.gitignore index 5fe2fed..29c0fd6 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ recoll-1.13.04.tar.gz /recoll-1.34.3.tar.gz /recoll-1.34.5.tar.gz /recoll-1.34.6.tar.gz +/recoll-1.34.7.tar.gz diff --git a/70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch b/70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch new file mode 100644 index 0000000..6bf79d5 --- /dev/null +++ b/70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch @@ -0,0 +1,30 @@ +From 70acdfd8c25f3a5429fbc8988758e2fa00c3833f Mon Sep 17 00:00:00 2001 +From: Jean-Francois Dockes +Date: Wed, 17 May 2023 15:25:26 +0200 +Subject: [PATCH] query aspell speller: catch the error when speller creation + fails (e.g. for permissions) + +--- + src/filters/rclaspell-sugg.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/filters/rclaspell-sugg.py b/src/filters/rclaspell-sugg.py +index 4c9a4b64..29df7e02 100755 +--- a/filters/rclaspell-sugg.py ++++ b/filters/rclaspell-sugg.py +@@ -51,7 +51,11 @@ if len(args) != 1 or args[0] != "pipe": + #[("lang","en"), ("encoding","utf-8"), ("master","/home/dockes/.recoll-prod/aspdict.en.rws"), + # ("sug-mode", "fast")] + +-speller = Speller(*options) ++try: ++ speller = Speller(*options) ++except Exception as ex: ++ deb(f"Aspell speller creation failed: {ex}") ++ sys.exit(1) + + print("@(#) International Ispell Version 3.1.20 (but really rclaspell-sugg 0.60.8)") + sys.stdout.flush() +-- +GitLab + diff --git a/recoll-1.25.20-py3-only.patch b/recoll-1.25.20-py3-only.patch deleted file mode 100644 index b9a3adb..0000000 --- a/recoll-1.25.20-py3-only.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index c4eae29..4d39e79 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2397,13 +2397,13 @@ PicStatic: $(librecoll_la_OBJECTS) - @MAKEPYTHON_TRUE@clean-local:: recollpython-clean - @MAKEPYTHON_TRUE@recollpython: librecoll.la - @MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \ --@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ -+@MAKEPYTHON_TRUE@ for v in 3;do test -n "`which python$${v}`" && \ - @MAKEPYTHON_TRUE@ libdir=$(libdir) python$${v} setup.py build; \ - @MAKEPYTHON_TRUE@ done \ - @MAKEPYTHON_TRUE@ ) - @MAKEPYTHON_TRUE@recollpython-install: - @MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \ --@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ -+@MAKEPYTHON_TRUE@ for v in 3;do test -n "`which python$${v}`" && \ - @MAKEPYTHON_TRUE@ python$${v} setup.py install \ - @MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \ - @MAKEPYTHON_TRUE@ done; \ -@@ -2422,13 +2422,13 @@ PicStatic: $(librecoll_la_OBJECTS) - @MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean - @MAKEPYTHONCHM_TRUE@rclpychm: - @MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \ --@MAKEPYTHONCHM_TRUE@ for v in 2 3;do \ -+@MAKEPYTHONCHM_TRUE@ for v in 3;do \ - @MAKEPYTHONCHM_TRUE@ test -n "`which python$${v}`" && python$${v} setup.py build;\ - @MAKEPYTHONCHM_TRUE@ done \ - @MAKEPYTHONCHM_TRUE@ ) - @MAKEPYTHONCHM_TRUE@rclpychm-install: - @MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \ --@MAKEPYTHONCHM_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ -+@MAKEPYTHONCHM_TRUE@ for v in 3;do test -n "`which python$${v}`" && \ - @MAKEPYTHONCHM_TRUE@ python$${v} setup.py install \ - @MAKEPYTHONCHM_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \ - @MAKEPYTHONCHM_TRUE@ done \ diff --git a/recoll.spec b/recoll.spec index 92b621d..23374ed 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,14 +2,15 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.34.6 -Release: 2%{?dist} +Version: 1.34.7 +Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch +Patch02: https://framagit.org/medoc92/recoll/-/commit/70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -186,6 +187,10 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Jun 25 2023 Terje Rosten - 1.34.7-1 +- 1.34.7 +- Add patch from upstream to fix bz#2213017 and bz#2203626 + * Tue Jun 13 2023 Python Maint - 1.34.6-2 - Rebuilt for Python 3.12 diff --git a/sources b/sources index 2fb070a..4527465 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.34.6.tar.gz) = f151a8f3575af41277fc9b50bb9a5e2ea1348e035b3dead36b47d1d6918deb755a4d59913d174db48273afdd95f4a063aa20219f1116a6d83c82fb063dbf16b7 +SHA512 (recoll-1.34.7.tar.gz) = d27c5c91e8cdfb3262edaa30a1a15256eccfc79f5630da357fe7076abbd14c80fa3ae72ddfa71af5b1be49b40e4b6ba3f59a93a7e0ea3e0f49c97adb4599f006 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From 9e77f6f7b864fe299dd85729aad8bba781918b8d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 26 Jun 2023 12:27:55 +0200 Subject: [PATCH 21/67] Rebuilt for Python 3.12 --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 23374ed..af7e6d1 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.34.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -187,6 +187,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Jun 26 2023 Python Maint - 1.34.7-2 +- Rebuilt for Python 3.12 + * Sun Jun 25 2023 Terje Rosten - 1.34.7-1 - 1.34.7 - Add patch from upstream to fix bz#2213017 and bz#2203626 From 6ef2b5ee5ff308ef1a83f57510784b2df1883895 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 16:40:12 +0000 Subject: [PATCH 22/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index af7e6d1..34f24d8 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.34.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -187,6 +187,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.34.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 26 2023 Python Maint - 1.34.7-2 - Rebuilt for Python 3.12 From 1622a171ab9990c936d8148448cd466b41cabebf Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Thu, 17 Aug 2023 11:09:03 +0200 Subject: [PATCH 23/67] 1.35.0 --- .gitignore | 1 + ...dfd8c25f3a5429fbc8988758e2fa00c3833f.patch | 30 ------------------- recoll.spec | 8 +++-- sources | 2 +- 4 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch diff --git a/.gitignore b/.gitignore index 29c0fd6..5e75d83 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ recoll-1.13.04.tar.gz /recoll-1.34.5.tar.gz /recoll-1.34.6.tar.gz /recoll-1.34.7.tar.gz +/recoll-1.35.0.tar.gz diff --git a/70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch b/70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch deleted file mode 100644 index 6bf79d5..0000000 --- a/70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 70acdfd8c25f3a5429fbc8988758e2fa00c3833f Mon Sep 17 00:00:00 2001 -From: Jean-Francois Dockes -Date: Wed, 17 May 2023 15:25:26 +0200 -Subject: [PATCH] query aspell speller: catch the error when speller creation - fails (e.g. for permissions) - ---- - src/filters/rclaspell-sugg.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/filters/rclaspell-sugg.py b/src/filters/rclaspell-sugg.py -index 4c9a4b64..29df7e02 100755 ---- a/filters/rclaspell-sugg.py -+++ b/filters/rclaspell-sugg.py -@@ -51,7 +51,11 @@ if len(args) != 1 or args[0] != "pipe": - #[("lang","en"), ("encoding","utf-8"), ("master","/home/dockes/.recoll-prod/aspdict.en.rws"), - # ("sug-mode", "fast")] - --speller = Speller(*options) -+try: -+ speller = Speller(*options) -+except Exception as ex: -+ deb(f"Aspell speller creation failed: {ex}") -+ sys.exit(1) - - print("@(#) International Ispell Version 3.1.20 (but really rclaspell-sugg 0.60.8)") - sys.stdout.flush() --- -GitLab - diff --git a/recoll.spec b/recoll.spec index 34f24d8..a087ecb 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,15 +2,14 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.34.7 -Release: 3%{?dist} +Version: 1.35.0 +Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch -Patch02: https://framagit.org/medoc92/recoll/-/commit/70acdfd8c25f3a5429fbc8988758e2fa00c3833f.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -187,6 +186,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Thu Aug 17 2023 Terje Rosten - 1.35.0-1 +- 1.35.0 + * Fri Jul 21 2023 Fedora Release Engineering - 1.34.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 4527465..7440107 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.34.7.tar.gz) = d27c5c91e8cdfb3262edaa30a1a15256eccfc79f5630da357fe7076abbd14c80fa3ae72ddfa71af5b1be49b40e4b6ba3f59a93a7e0ea3e0f49c97adb4599f006 +SHA512 (recoll-1.35.0.tar.gz) = 35dcbfb650251b00f2c7654dc7617bf24f7e480955121821c55e0d31c6ec4fa041f8f99e64afa12ad4ead725c366084d7d727dbdcee875b93bbc858a6229d236 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From 01c76cf75b9559e48c51ff1a7b617a4bbc939159 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 15 Oct 2023 14:52:25 +0200 Subject: [PATCH 24/67] Add explicit buildreq on qt5-linguist Use kde4 macros for kde4 parts --- recoll.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/recoll.spec b/recoll.spec index a087ecb..51811b0 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.35.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -30,6 +30,7 @@ BuildRequires: make BuildRequires: python-rpm-macros BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: qt5-linguist BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtwebkit-devel BuildRequires: xapian-core-devel @@ -111,8 +112,11 @@ pushd kde/kioslave/kio_recoll popd # kio_recoll -kde4 +export QMAKE=qmake-qt4 pushd kde/kioslave/kio_recoll-kde4 -%cmake +mkdir -p %{_vpath_builddir} && pushd %{_vpath_builddir} +%cmake_kde4 .. +popd %cmake_build %cmake_install popd @@ -186,6 +190,10 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Oct 15 2023 Terje Rosten - 1.35.0-2 +- Add explicit buildreq on qt5-linguist +- Use kde4 macros for kde4 parts + * Thu Aug 17 2023 Terje Rosten - 1.35.0-1 - 1.35.0 From 068ebccbad3941fc7f3308a5f5371797b0589b96 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Wed, 1 Nov 2023 21:04:37 +0100 Subject: [PATCH 25/67] 1.36.0 Ship public lib in -libs package Ship headers in -devel package --- .gitignore | 1 + recoll.spec | 40 +++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5e75d83..9a95c14 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ recoll-1.13.04.tar.gz /recoll-1.34.6.tar.gz /recoll-1.34.7.tar.gz /recoll-1.35.0.tar.gz +/recoll-1.36.0.tar.gz diff --git a/recoll.spec b/recoll.spec index 51811b0..5f74478 100644 --- a/recoll.spec +++ b/recoll.spec @@ -1,9 +1,10 @@ %global gsspver 1.1.1 +%global __cmake_in_source_build 1 Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.35.0 -Release: 2%{?dist} +Version: 1.36.0 +Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -43,6 +44,18 @@ other Unix systems. It is based on a very strong back end (Xapian), for which it provides an easy to use, feature-rich, easy administration interface. +%package libs +Summary: Libraries for Recoll applications +%description libs +Shared libraries required to run Recoll applications. + +%package devel +Summary: Libraries and header files to develop Recoll enabled applications +Requires: %{name}-libs = %{version}-%{release} +%description devel +Libraries and header files required to develop Recoll enabled +applications. + %package kio Summary: KIO support for recoll Requires: %{name} = %{version}-%{release} @@ -82,7 +95,7 @@ LDFLAGS="%{?__global_ldflags}"; export LDFLAGS install -m755 -D %{SOURCE10} qmake-qt5.sh export QMAKE=qmake-qt5 -%configure --enable-recollq +%configure --enable-recollq --enable-publiclib make %{?_smp_mflags} # gssp @@ -106,7 +119,7 @@ rm %{buildroot}%{_datadir}/recoll/filters/hotrecoll.py # kio_recoll -kde5 pushd kde/kioslave/kio_recoll -%cmake +%cmake -DRECOLL_PUBLIC_LIB=1 %cmake_build %cmake_install popd @@ -114,16 +127,14 @@ popd # kio_recoll -kde4 export QMAKE=qmake-qt4 pushd kde/kioslave/kio_recoll-kde4 -mkdir -p %{_vpath_builddir} && pushd %{_vpath_builddir} -%cmake_kde4 .. -popd +%cmake_kde4 -DRECOLL_PUBLIC_LIB=1 %cmake_build %cmake_install popd # krunner_recoll pushd kde/krunner -%cmake +%cmake -DRECOLL_PUBLIC_LIB=1 %cmake_build %cmake_install popd @@ -153,7 +164,6 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/recoll-searchgui.desktop %{_datadir}/icons/hicolor/48x48/apps/recoll.png %{_datadir}/pixmaps/recoll.png -%{_libdir}/recoll %{python3_sitearch}/recoll %{python3_sitearch}/recollchm %{python3_sitearch}/Recoll-*.egg-info @@ -169,6 +179,13 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_unitdir}/recollindex@.service %{_userunitdir}/recollindex.service +%files libs +%{_libdir}/librecoll-%{version}.so + +%files devel +%{_libdir}/librecoll.so +%{_includedir}/recoll + %files kio %license COPYING %{_libdir}/kde4/kio_recoll.so @@ -190,6 +207,11 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Oct 30 2023 Terje Rosten - 1.36.0-1 +- 1.36.0 +- Ship public lib in -libs package +- Ship headers in -devel package + * Sun Oct 15 2023 Terje Rosten - 1.35.0-2 - Add explicit buildreq on qt5-linguist - Use kde4 macros for kde4 parts diff --git a/sources b/sources index 7440107..5ab6e4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.35.0.tar.gz) = 35dcbfb650251b00f2c7654dc7617bf24f7e480955121821c55e0d31c6ec4fa041f8f99e64afa12ad4ead725c366084d7d727dbdcee875b93bbc858a6229d236 +SHA512 (recoll-1.36.0.tar.gz) = 40f10ae35de1f9750199792876170c0f538dd869963e3f7c1a64a19535361c48afbaf0c776a7668ca5cff3e73179d78077233bddc36ce0277e873de7252892d9 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From b5763483764a61da319540e1c9f4b0e5b2b1742e Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sat, 4 Nov 2023 17:48:25 +0100 Subject: [PATCH 26/67] 1.36.1 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9a95c14..f538d5e 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ recoll-1.13.04.tar.gz /recoll-1.34.7.tar.gz /recoll-1.35.0.tar.gz /recoll-1.36.0.tar.gz +/recoll-1.36.1.tar.gz diff --git a/recoll.spec b/recoll.spec index 5f74478..34d7e84 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.36.0 +Version: 1.36.1 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -207,6 +207,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Nov 04 2023 Terje Rosten - 1.36.1-1 +- 1.36.1 + * Mon Oct 30 2023 Terje Rosten - 1.36.0-1 - 1.36.0 - Ship public lib in -libs package diff --git a/sources b/sources index 5ab6e4f..f9016bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.36.0.tar.gz) = 40f10ae35de1f9750199792876170c0f538dd869963e3f7c1a64a19535361c48afbaf0c776a7668ca5cff3e73179d78077233bddc36ce0277e873de7252892d9 +SHA512 (recoll-1.36.1.tar.gz) = 884925e2bedc1d94d446285d0514ec1892730a67b2b3955ab5addb6b2cf5411dd192446fb4ccf012249f01dddcee71b4040a8a5f3148a3e25fd8c23000fb16ee SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From 35198901fc6db154afe56f227798566dd9e9884b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 11:07:13 +0000 Subject: [PATCH 27/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 34d7e84..f5ab44d 100644 --- a/recoll.spec +++ b/recoll.spec @@ -4,7 +4,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.36.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -207,6 +207,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.36.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Nov 04 2023 Terje Rosten - 1.36.1-1 - 1.36.1 From 7c41a09fbbcb2c59eab499a4680acd408cf05cc3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 14:59:23 +0000 Subject: [PATCH 28/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index f5ab44d..f0a6dff 100644 --- a/recoll.spec +++ b/recoll.spec @@ -4,7 +4,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.36.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -207,6 +207,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1.36.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.36.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From aea58347e1ecd6cc4f3beb3f675eaa5cb353aec2 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 28 Jan 2024 17:22:46 +0100 Subject: [PATCH 29/67] 1.37.0 --- .gitignore | 1 + recoll.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f538d5e..7a34d4f 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ recoll-1.13.04.tar.gz /recoll-1.35.0.tar.gz /recoll-1.36.0.tar.gz /recoll-1.36.1.tar.gz +/recoll-1.37.0.tar.gz diff --git a/recoll.spec b/recoll.spec index f0a6dff..8861259 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,8 +3,8 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.36.1 -Release: 3%{?dist} +Version: 1.37.0 +Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -207,6 +207,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Jan 28 2024 Terje Rosten - 1.37.0-1 +- 1.37.0 + * Fri Jan 26 2024 Fedora Release Engineering - 1.36.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index f9016bb..ce11d3d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.36.1.tar.gz) = 884925e2bedc1d94d446285d0514ec1892730a67b2b3955ab5addb6b2cf5411dd192446fb4ccf012249f01dddcee71b4040a8a5f3148a3e25fd8c23000fb16ee +SHA512 (recoll-1.37.0.tar.gz) = cdab2623f48727178d37565f565f938d3e4364224ea85ddfd59bb3a68897574e3c5bcc985ef342f14e020b92f9e1672962bf31312f7f7fb2abea414425970b52 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From 9779eebb34ae5fefeb53f8e8838d02ce7c095c3e Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 28 Jan 2024 17:53:16 +0100 Subject: [PATCH 30/67] Fix libxml2 issue --- recoll-1.37.0-libxml2.patch | 20 ++++++++++++++++++++ recoll.spec | 1 + 2 files changed, 21 insertions(+) create mode 100644 recoll-1.37.0-libxml2.patch diff --git a/recoll-1.37.0-libxml2.patch b/recoll-1.37.0-libxml2.patch new file mode 100644 index 0000000..176998e --- /dev/null +++ b/recoll-1.37.0-libxml2.patch @@ -0,0 +1,20 @@ +--- a/internfile/mh_xslt.cpp.orig 2024-01-28 17:37:36.251834894 +0100 ++++ b/internfile/mh_xslt.cpp 2024-01-28 17:37:52.383917880 +0100 +@@ -66,7 +66,7 @@ + xmlDocPtr getDoc() { + int ret; + if ((ret = xmlParseChunk(ctxt, nullptr, 0, 1))) { +- xmlError *error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + LOGERR("FileScanXML: final xmlParseChunk failed with error " << + ret << " error: " << + (error ? error->message : +@@ -95,7 +95,7 @@ + } + int ret; + if ((ret = xmlParseChunk(ctxt, buf, cnt, 0))) { +- xmlError *error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + LOGERR("FileScanXML: xmlParseChunk failed with error " << + ret << " for [" << buf << "] error " << + (error ? error->message : diff --git a/recoll.spec b/recoll.spec index 8861259..17a51f6 100644 --- a/recoll.spec +++ b/recoll.spec @@ -11,6 +11,7 @@ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch +Patch02: recoll-1.37.0-libxml2.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel From 897cceda77aeb3b9e519eb4129aa18ef57216620 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 4 Feb 2024 18:18:07 +0100 Subject: [PATCH 31/67] 1.37.4 --- .gitignore | 1 + recoll-1.37.0-libxml2.patch | 20 -------------------- recoll.spec | 6 ++++-- sources | 2 +- 4 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 recoll-1.37.0-libxml2.patch diff --git a/.gitignore b/.gitignore index 7a34d4f..4aa0fbb 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ recoll-1.13.04.tar.gz /recoll-1.36.0.tar.gz /recoll-1.36.1.tar.gz /recoll-1.37.0.tar.gz +/recoll-1.37.4.tar.gz diff --git a/recoll-1.37.0-libxml2.patch b/recoll-1.37.0-libxml2.patch deleted file mode 100644 index 176998e..0000000 --- a/recoll-1.37.0-libxml2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/internfile/mh_xslt.cpp.orig 2024-01-28 17:37:36.251834894 +0100 -+++ b/internfile/mh_xslt.cpp 2024-01-28 17:37:52.383917880 +0100 -@@ -66,7 +66,7 @@ - xmlDocPtr getDoc() { - int ret; - if ((ret = xmlParseChunk(ctxt, nullptr, 0, 1))) { -- xmlError *error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - LOGERR("FileScanXML: final xmlParseChunk failed with error " << - ret << " error: " << - (error ? error->message : -@@ -95,7 +95,7 @@ - } - int ret; - if ((ret = xmlParseChunk(ctxt, buf, cnt, 0))) { -- xmlError *error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - LOGERR("FileScanXML: xmlParseChunk failed with error " << - ret << " for [" << buf << "] error " << - (error ? error->message : diff --git a/recoll.spec b/recoll.spec index 17a51f6..83933e2 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.37.0 +Version: 1.37.4 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -11,7 +11,6 @@ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh Patch01: recoll-1.25.11-appdata.patch -Patch02: recoll-1.37.0-libxml2.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -208,6 +207,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Feb 04 2024 Terje Rosten - 1.37.4-1 +- 1.37.4 + * Sun Jan 28 2024 Terje Rosten - 1.37.0-1 - 1.37.0 diff --git a/sources b/sources index ce11d3d..67c80f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.37.0.tar.gz) = cdab2623f48727178d37565f565f938d3e4364224ea85ddfd59bb3a68897574e3c5bcc985ef342f14e020b92f9e1672962bf31312f7f7fb2abea414425970b52 +SHA512 (recoll-1.37.4.tar.gz) = 9e5af5d00191658f23e6a5916718014827f12f4553d9429fe385c0bd1c72f2f49ae97e7d7b8121cb174b299ffe482aa547e4a3aabf2da92e9773bf9eb0f57814 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From b82c112f9c72514bda89f2597567df9fc79d75a6 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Mon, 6 May 2024 20:04:51 +0200 Subject: [PATCH 32/67] 1.37.5 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4aa0fbb..150ac48 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ recoll-1.13.04.tar.gz /recoll-1.36.1.tar.gz /recoll-1.37.0.tar.gz /recoll-1.37.4.tar.gz +/recoll-1.37.5.tar.gz diff --git a/recoll.spec b/recoll.spec index 83933e2..3acc927 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.37.4 +Version: 1.37.5 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -207,6 +207,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun May 05 2024 Terje Rosten - 1.37.5-1 +- 1.37.5 + * Sun Feb 04 2024 Terje Rosten - 1.37.4-1 - 1.37.4 diff --git a/sources b/sources index 67c80f4..dd46d65 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.37.4.tar.gz) = 9e5af5d00191658f23e6a5916718014827f12f4553d9429fe385c0bd1c72f2f49ae97e7d7b8121cb174b299ffe482aa547e4a3aabf2da92e9773bf9eb0f57814 +SHA512 (recoll-1.37.5.tar.gz) = 594a81de809a2f2f08986ef1220ea2d7df8292923f55cf41c5813eb50be9ca63aa9f77c38bd27466486e72b030f2df28a093bca32dae1682d514acbb11a76382 SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 From e6b197e7010ae25f77eb2bc0320b62dad81ff464 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:10:39 +0200 Subject: [PATCH 33/67] Rebuilt for Python 3.13 --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 3acc927..9fe728f 100644 --- a/recoll.spec +++ b/recoll.spec @@ -4,7 +4,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.37.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz @@ -207,6 +207,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Fri Jun 07 2024 Python Maint - 1.37.5-2 +- Rebuilt for Python 3.13 + * Sun May 05 2024 Terje Rosten - 1.37.5-1 - 1.37.5 From 4811681f0e5c6931c0a8e4cf248c1a51d4b45a6b Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Fri, 28 Jun 2024 18:21:42 +0200 Subject: [PATCH 34/67] 1.39.1 --- .gitignore | 2 ++ recoll-1.25.11-appdata.patch | 29 -------------------------- recoll.spec | 40 +++++++++++++++++------------------- sources | 4 ++-- 4 files changed, 23 insertions(+), 52 deletions(-) delete mode 100644 recoll-1.25.11-appdata.patch diff --git a/.gitignore b/.gitignore index 150ac48..8e8181c 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,5 @@ recoll-1.13.04.tar.gz /recoll-1.37.0.tar.gz /recoll-1.37.4.tar.gz /recoll-1.37.5.tar.gz +/recoll-1.39.1.tar.gz +/gssp-recoll-1.1.3.tar.gz diff --git a/recoll-1.25.11-appdata.patch b/recoll-1.25.11-appdata.patch deleted file mode 100644 index 123d5d6..0000000 --- a/recoll-1.25.11-appdata.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/desktop/recoll.appdata.xml b/desktop/recoll.appdata.xml -index 3a9a1ff..d0b0f8e 100644 ---- a/desktop/recoll.appdata.xml -+++ b/desktop/recoll.appdata.xml -@@ -1,7 +1,7 @@ - - -- -- recoll.desktop -+ -+ org.recoll.www - CC0-1.0 - GPL-2.0+ - Recoll -@@ -17,8 +17,11 @@ - - - -- http://www.recoll.org/files/recoll-mainwin-h-1248x702.png -+ -+ The Recoll search interface. -+ https://www.lesbonscomptes.com/recoll/pics/recoll0.png -+ - - http://www.recoll.org/ -- contact@recoll.org -- -+ contact@recoll.org -+ diff --git a/recoll.spec b/recoll.spec index 9fe728f..c9b3608 100644 --- a/recoll.spec +++ b/recoll.spec @@ -1,21 +1,21 @@ -%global gsspver 1.1.1 +%global gsspver 1.1.3 %global __cmake_in_source_build 1 Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.37.5 -Release: 2%{?dist} +Version: 1.39.1 +Release: 1%{?dist} License: GPLv2+ -URL: https://www.lesbonscomptes.com/recoll/ -Source0: https://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz -Source1: https://www.lesbonscomptes.com/recoll/downloads/gssp-recoll-%{gsspver}.tar.gz +URL: https://www.recoll.org +Source0: https://www.recoll.org/recoll-%{version}.tar.gz +Source1: https://www.recoll.org/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh -Patch01: recoll-1.25.11-appdata.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules +BuildRequires: file-devel BuildRequires: gcc-c++ # kio BuildRequires: kdelibs4-devel @@ -28,6 +28,7 @@ BuildRequires: kf5-kpackage-devel BuildRequires: libxslt-devel BuildRequires: make +BuildRequires: meson BuildRequires: python-rpm-macros BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -94,9 +95,8 @@ LDFLAGS="%{?__global_ldflags}"; export LDFLAGS # force use of custom/local qmake, to inject proper build flags (above) install -m755 -D %{SOURCE10} qmake-qt5.sh export QMAKE=qmake-qt5 - -%configure --enable-recollq --enable-publiclib -make %{?_smp_mflags} +%meson -Drecollq=true -Dsystemd=true +%meson_build # gssp pushd gssp @@ -104,7 +104,7 @@ pushd gssp popd %install -make install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p' +%meson_install desktop-file-install --delete-original \ --dir=%{buildroot}/%{_datadir}/applications \ @@ -114,8 +114,7 @@ desktop-file-install --delete-original \ rm -f %{buildroot}/usr/share/recoll/filters/xdg-open rm -f %{buildroot}%{_libdir}/recoll/librecoll.la -# remove useless script with Python 2 dep -rm %{buildroot}%{_datadir}/recoll/filters/hotrecoll.py +export RECOLL_LIB_DIR=%{_builddir}/%{name}-%{version}/redhat-linux-build/ # kio_recoll -kde5 pushd kde/kioslave/kio_recoll @@ -160,27 +159,23 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_bindir}/recollindex %{_bindir}/recollq %{_datadir}/recoll -%{_datadir}/metainfo/recoll.appdata.xml +%{_datadir}/metainfo/org.recoll.recoll.appdata.xml %{_datadir}/applications/recoll-searchgui.desktop %{_datadir}/icons/hicolor/48x48/apps/recoll.png %{_datadir}/pixmaps/recoll.png %{python3_sitearch}/recoll %{python3_sitearch}/recollchm -%{python3_sitearch}/Recoll-*.egg-info -%{python3_sitearch}/recollchm-*.egg-info %{python3_sitearch}/recollaspell.cpython-*-linux-gnu*.so -%{python3_sitearch}/recoll_aspell_python_py3-*.egg-info %{_mandir}/man1/recoll.1* %{_mandir}/man1/recollq.1* %{_mandir}/man1/recollindex.1* -#{_mandir}/man1/rclgrep.1* -#{_mandir}/man1/xadump.1* +%{_mandir}/man1/xadump.1* %{_mandir}/man5/recoll.conf.5* %{_unitdir}/recollindex@.service %{_userunitdir}/recollindex.service %files libs -%{_libdir}/librecoll-%{version}.so +%{_libdir}/librecoll.so.* %files devel %{_libdir}/librecoll.so @@ -197,7 +192,7 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/kio_recoll/welcome.html %files krunner -%{_libdir}/qt5/plugins/kf5/krunner/runner_recoll.so +%{_libdir}/qt5/plugins/kf5/krunner/krunner_recoll.so %files gssp %license COPYING @@ -207,6 +202,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Thu Jun 27 2024 Terje Rosten - 1.39.1-1 +- 1.39.1 + * Fri Jun 07 2024 Python Maint - 1.37.5-2 - Rebuilt for Python 3.13 diff --git a/sources b/sources index dd46d65..4ccbe82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.37.5.tar.gz) = 594a81de809a2f2f08986ef1220ea2d7df8292923f55cf41c5813eb50be9ca63aa9f77c38bd27466486e72b030f2df28a093bca32dae1682d514acbb11a76382 -SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8 +SHA512 (recoll-1.39.1.tar.gz) = 65f09f9728b4888f2eb8bd27a3aa6b6505e8e0f0a29e44da028b6d5c0e0c711d28de091e89c144ade3d14a6ffeaf3e0d39bcac31f6255dbec6e1bc6fbd6d1a6c +SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From 527102c40c74023b3a6c3a9ce3ecef3a447aa01d Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Fri, 28 Jun 2024 23:51:02 +0200 Subject: [PATCH 35/67] Fix build --- qmake-qt5.sh | 2 +- recoll-1.39.1-nproc.patch | 18 ++++++++++++++++++ recoll.spec | 6 ++++-- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 recoll-1.39.1-nproc.patch diff --git a/qmake-qt5.sh b/qmake-qt5.sh index 988d8a1..09d9fe6 100755 --- a/qmake-qt5.sh +++ b/qmake-qt5.sh @@ -1,7 +1,7 @@ #!/bin/sh /usr/bin/qmake-qt5 \ - $@ \ + "$@" \ QMAKE_CFLAGS_RELEASE="${CFLAGS}" \ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \ QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \ diff --git a/recoll-1.39.1-nproc.patch b/recoll-1.39.1-nproc.patch new file mode 100644 index 0000000..c1c27ab --- /dev/null +++ b/recoll-1.39.1-nproc.patch @@ -0,0 +1,18 @@ +diff --git a/qtgui/qmkmk.sh b/qtgui/qmkmk.sh +index 2e45d16..cc4f7b4 100755 +--- a/qtgui/qmkmk.sh ++++ b/qtgui/qmkmk.sh +@@ -12,12 +12,7 @@ fn=`basename $pro_file` + QMAKE=${QMAKE:-qmake} + MAKE=${MAKE:-make} + +-ncpus=2 +-if test -f /proc/cpuinfo; then +- ncpus=`grep -E '^processor[ ]*:' /proc/cpuinfo | wc -l` +-elif which sysctl > /dev/null;then +- ncpus=`sysctl hw.ncpu | awk '{print $3}'` +-fi ++ncpus=`nproc` + + cd $dir + ${QMAKE} $fn $* diff --git a/recoll.spec b/recoll.spec index c9b3608..61f9e37 100644 --- a/recoll.spec +++ b/recoll.spec @@ -10,6 +10,7 @@ URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh +Patch1: recoll-1.39.1-nproc.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -94,9 +95,10 @@ LDFLAGS="%{?__global_ldflags}"; export LDFLAGS # force use of custom/local qmake, to inject proper build flags (above) install -m755 -D %{SOURCE10} qmake-qt5.sh -export QMAKE=qmake-qt5 +export QMAKE=$(pwd)/qmake-qt5.sh %meson -Drecollq=true -Dsystemd=true -%meson_build +%meson_build || : +/usr/bin/ninja -j 1 -v -C %{_builddir}/%{name}-%{version}/redhat-linux-build # gssp pushd gssp From 7e76034b5af9b2905a23f081feac84fb35f01dc1 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 30 Jun 2024 10:58:01 +0200 Subject: [PATCH 36/67] Add patch from upstream to fix parallel build --- recoll-1.39.1-meson.patch | 19 +++++++++++++++++++ recoll-1.39.1-nproc.patch | 35 +++++++++++++++++++++++++---------- recoll.spec | 9 ++++++--- 3 files changed, 50 insertions(+), 13 deletions(-) create mode 100644 recoll-1.39.1-meson.patch diff --git a/recoll-1.39.1-meson.patch b/recoll-1.39.1-meson.patch new file mode 100644 index 0000000..215f883 --- /dev/null +++ b/recoll-1.39.1-meson.patch @@ -0,0 +1,19 @@ +commit 021e6980935142938679b43daa21cb3b2301f4da +Author: Jean-Francois Dockes +Date: Tue Jun 25 08:22:38 2024 +0200 + + GUI: meson.build: add depends on librecoll. Will fix build ordering issues + +diff --git a/src/qtgui/meson.build b/src/qtgui/meson.build +index 85bca020..2a544f79 100644 +--- a/qtgui/meson.build ++++ b/qtgui/meson.build +@@ -52,6 +52,7 @@ recoll = custom_target( + output: outfile, + input: infile, + command: [qmkmk, '@INPUT@', prefixoption], ++ depends: librecoll, + install: true, + install_dir: 'bin', + ) + diff --git a/recoll-1.39.1-nproc.patch b/recoll-1.39.1-nproc.patch index c1c27ab..5f738fa 100644 --- a/recoll-1.39.1-nproc.patch +++ b/recoll-1.39.1-nproc.patch @@ -1,18 +1,33 @@ -diff --git a/qtgui/qmkmk.sh b/qtgui/qmkmk.sh -index 2e45d16..cc4f7b4 100755 ---- a/qtgui/qmkmk.sh -+++ b/qtgui/qmkmk.sh -@@ -12,12 +12,7 @@ fn=`basename $pro_file` - QMAKE=${QMAKE:-qmake} +From d34fec5fb78cd11fad2706d271b7d4cf08cdbec3 Mon Sep 17 00:00:00 2001 +From: Terje Rosten +Date: Sat, 29 Jun 2024 11:10:08 +0200 +Subject: [PATCH] Prefer nproc over procinfo parsing + +--- + src/qtgui/qmkmk.sh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/qtgui/qmkmk.sh b/src/qtgui/qmkmk.sh +index 2e45d16f..a0b049c4 100755 +--- a/src/qtgui/qmkmk.sh ++++ b/src/qtgui/qmkmk.sh +@@ -13,10 +13,12 @@ QMAKE=${QMAKE:-qmake} MAKE=${MAKE:-make} --ncpus=2 + ncpus=2 -if test -f /proc/cpuinfo; then - ncpus=`grep -E '^processor[ ]*:' /proc/cpuinfo | wc -l` -elif which sysctl > /dev/null;then - ncpus=`sysctl hw.ncpu | awk '{print $3}'` --fi -+ncpus=`nproc` ++if test -x /usr/bin/nproc ; then ++ ncpus=`nproc` ++elif which sysctl > /dev/null ; then ++ ncpus=`sysctl hw.ncpu | awk '{print $3}` ++elif test -f /proc/cpuinfo ; then ++ ncpus=`grep -E '^processor[ ]*:' /proc/cpuinfo | wc -l` + fi cd $dir - ${QMAKE} $fn $* +-- +2.40.1 + diff --git a/recoll.spec b/recoll.spec index 61f9e37..5c90718 100644 --- a/recoll.spec +++ b/recoll.spec @@ -4,13 +4,14 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.39.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh Patch1: recoll-1.39.1-nproc.patch +Patch2: recoll-1.39.1-meson.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -97,8 +98,7 @@ LDFLAGS="%{?__global_ldflags}"; export LDFLAGS install -m755 -D %{SOURCE10} qmake-qt5.sh export QMAKE=$(pwd)/qmake-qt5.sh %meson -Drecollq=true -Dsystemd=true -%meson_build || : -/usr/bin/ninja -j 1 -v -C %{_builddir}/%{name}-%{version}/redhat-linux-build +%meson_build # gssp pushd gssp @@ -204,6 +204,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Jun 30 2024 Terje Rosten - 1.39.1-2 +- Add patch from upstream to fix parallel build + * Thu Jun 27 2024 Terje Rosten - 1.39.1-1 - 1.39.1 From d65324ab288f559e28f452c72670b96132c1b3cf Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 30 Jun 2024 11:22:21 +0200 Subject: [PATCH 37/67] Fix patch --- recoll-1.39.1-nproc.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recoll-1.39.1-nproc.patch b/recoll-1.39.1-nproc.patch index 5f738fa..9bda5f4 100644 --- a/recoll-1.39.1-nproc.patch +++ b/recoll-1.39.1-nproc.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Prefer nproc over procinfo parsing diff --git a/src/qtgui/qmkmk.sh b/src/qtgui/qmkmk.sh index 2e45d16f..a0b049c4 100755 ---- a/src/qtgui/qmkmk.sh -+++ b/src/qtgui/qmkmk.sh +--- a/qtgui/qmkmk.sh ++++ b/qtgui/qmkmk.sh @@ -13,10 +13,12 @@ QMAKE=${QMAKE:-qmake} MAKE=${MAKE:-make} From 441432b787344721f67525819de35a7a3f1b4fc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 18:23:39 +0000 Subject: [PATCH 38/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 5c90718..318049a 100644 --- a/recoll.spec +++ b/recoll.spec @@ -4,7 +4,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.39.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz @@ -204,6 +204,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.39.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 30 2024 Terje Rosten - 1.39.1-2 - Add patch from upstream to fix parallel build From 278f85790f9254dbb0ffa7d224746c2b01e483a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 02:34:01 +0200 Subject: [PATCH 39/67] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- recoll.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recoll.spec b/recoll.spec index 318049a..1bb56cd 100644 --- a/recoll.spec +++ b/recoll.spec @@ -4,8 +4,9 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.39.1 -Release: 3%{?dist} -License: GPLv2+ +Release: 4%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/gssp-recoll-%{gsspver}.tar.gz @@ -204,6 +205,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.39.1-4 +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 1.39.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 148bbebd5eb346fad7c302f07943452c7e5b17ae Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Wed, 21 Aug 2024 17:57:31 +0200 Subject: [PATCH 40/67] 1.40.0 --- .gitignore | 1 + recoll-1.39.1-meson.patch | 19 ------------------- recoll-1.39.1-nproc.patch | 33 --------------------------------- recoll.spec | 9 +++++---- sources | 2 +- 5 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 recoll-1.39.1-meson.patch delete mode 100644 recoll-1.39.1-nproc.patch diff --git a/.gitignore b/.gitignore index 8e8181c..a828faa 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ recoll-1.13.04.tar.gz /recoll-1.37.5.tar.gz /recoll-1.39.1.tar.gz /gssp-recoll-1.1.3.tar.gz +/recoll-1.40.0.tar.gz diff --git a/recoll-1.39.1-meson.patch b/recoll-1.39.1-meson.patch deleted file mode 100644 index 215f883..0000000 --- a/recoll-1.39.1-meson.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 021e6980935142938679b43daa21cb3b2301f4da -Author: Jean-Francois Dockes -Date: Tue Jun 25 08:22:38 2024 +0200 - - GUI: meson.build: add depends on librecoll. Will fix build ordering issues - -diff --git a/src/qtgui/meson.build b/src/qtgui/meson.build -index 85bca020..2a544f79 100644 ---- a/qtgui/meson.build -+++ b/qtgui/meson.build -@@ -52,6 +52,7 @@ recoll = custom_target( - output: outfile, - input: infile, - command: [qmkmk, '@INPUT@', prefixoption], -+ depends: librecoll, - install: true, - install_dir: 'bin', - ) - diff --git a/recoll-1.39.1-nproc.patch b/recoll-1.39.1-nproc.patch deleted file mode 100644 index 9bda5f4..0000000 --- a/recoll-1.39.1-nproc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d34fec5fb78cd11fad2706d271b7d4cf08cdbec3 Mon Sep 17 00:00:00 2001 -From: Terje Rosten -Date: Sat, 29 Jun 2024 11:10:08 +0200 -Subject: [PATCH] Prefer nproc over procinfo parsing - ---- - src/qtgui/qmkmk.sh | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/qtgui/qmkmk.sh b/src/qtgui/qmkmk.sh -index 2e45d16f..a0b049c4 100755 ---- a/qtgui/qmkmk.sh -+++ b/qtgui/qmkmk.sh -@@ -13,10 +13,12 @@ QMAKE=${QMAKE:-qmake} - MAKE=${MAKE:-make} - - ncpus=2 --if test -f /proc/cpuinfo; then -- ncpus=`grep -E '^processor[ ]*:' /proc/cpuinfo | wc -l` --elif which sysctl > /dev/null;then -- ncpus=`sysctl hw.ncpu | awk '{print $3}'` -+if test -x /usr/bin/nproc ; then -+ ncpus=`nproc` -+elif which sysctl > /dev/null ; then -+ ncpus=`sysctl hw.ncpu | awk '{print $3}` -+elif test -f /proc/cpuinfo ; then -+ ncpus=`grep -E '^processor[ ]*:' /proc/cpuinfo | wc -l` - fi - - cd $dir --- -2.40.1 - diff --git a/recoll.spec b/recoll.spec index 1bb56cd..10e1a56 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,16 +3,14 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.39.1 -Release: 4%{?dist} +Version: 1.40.0 +Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh -Patch1: recoll-1.39.1-nproc.patch -Patch2: recoll-1.39.1-meson.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -205,6 +203,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Wed Aug 21 2024 Terje Rosten - 1.40.0-1 +- 1.40.0 + * Fri Jul 26 2024 Miroslav Suchý - 1.39.1-4 - convert license to SPDX diff --git a/sources b/sources index 4ccbe82..fe788e4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.39.1.tar.gz) = 65f09f9728b4888f2eb8bd27a3aa6b6505e8e0f0a29e44da028b6d5c0e0c711d28de091e89c144ade3d14a6ffeaf3e0d39bcac31f6255dbec6e1bc6fbd6d1a6c +SHA512 (recoll-1.40.0.tar.gz) = 31359cc8078f0a92f8ea1c242af5c6ec3c25289bf5045ba5e5d16fe6178b054487a6e68fed1942f3f38c48ebfe3ca4bb267a7cf7a66cba2235ba5800502872a5 SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From 07e0cf1c9a4e6ccff7457ebb35b3a3d0162a101d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 15 Sep 2024 20:47:36 +0200 Subject: [PATCH 41/67] 1.40.1 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a828faa..951833f 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ recoll-1.13.04.tar.gz /recoll-1.39.1.tar.gz /gssp-recoll-1.1.3.tar.gz /recoll-1.40.0.tar.gz +/recoll-1.40.1.tar.gz diff --git a/recoll.spec b/recoll.spec index 10e1a56..c0e25bd 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.40.0 +Version: 1.40.1 Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -203,6 +203,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Sep 15 2024 Terje Rosten - 1.40.1-1 +- 1.40.1 + * Wed Aug 21 2024 Terje Rosten - 1.40.0-1 - 1.40.0 diff --git a/sources b/sources index fe788e4..894655e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (recoll-1.40.0.tar.gz) = 31359cc8078f0a92f8ea1c242af5c6ec3c25289bf5045ba5e5d16fe6178b054487a6e68fed1942f3f38c48ebfe3ca4bb267a7cf7a66cba2235ba5800502872a5 -SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 +SHA512 (recoll-1.40.1.tar.gz) = 7590f1d17f9d8fc7930044d43d92be47158cbd2c830d8723a1604b672d3d8df22e507d7208525e1bfdc169b5151f5b6a3f96bbfefb5bededd0e2dae7bdeb2359 From dfd2046b6b32a60041074ef15b1e43bea6d54edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 15 Sep 2024 21:19:35 +0200 Subject: [PATCH 42/67] Fix source urls --- recoll.spec | 2 +- sources | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index c0e25bd..05fe14c 100644 --- a/recoll.spec +++ b/recoll.spec @@ -9,7 +9,7 @@ Release: 1%{?dist} License: GPL-2.0-or-later URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz -Source1: https://www.recoll.org/downloads/gssp-recoll-%{gsspver}.tar.gz +Source1: https://www.recoll.org/downloads/src/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh BuildRequires: aspell-devel BuildRequires: bison diff --git a/sources b/sources index 894655e..648efed 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 SHA512 (recoll-1.40.1.tar.gz) = 7590f1d17f9d8fc7930044d43d92be47158cbd2c830d8723a1604b672d3d8df22e507d7208525e1bfdc169b5151f5b6a3f96bbfefb5bededd0e2dae7bdeb2359 From 1a5bfe6e0caa8954e88f0e0fe7c2e65067bba53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 15 Oct 2024 17:48:02 +0200 Subject: [PATCH 43/67] 1.40.3 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 951833f..44403ea 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ recoll-1.13.04.tar.gz /gssp-recoll-1.1.3.tar.gz /recoll-1.40.0.tar.gz /recoll-1.40.1.tar.gz +/recoll-1.40.3.tar.gz diff --git a/recoll.spec b/recoll.spec index 05fe14c..42d8ca6 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.40.1 +Version: 1.40.3 Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -203,6 +203,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Tue Oct 15 2024 Terje Rosten - 1.40.3-1 +- 1.40.3 + * Sun Sep 15 2024 Terje Rosten - 1.40.1-1 - 1.40.1 diff --git a/sources b/sources index 648efed..9272279 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 -SHA512 (recoll-1.40.1.tar.gz) = 7590f1d17f9d8fc7930044d43d92be47158cbd2c830d8723a1604b672d3d8df22e507d7208525e1bfdc169b5151f5b6a3f96bbfefb5bededd0e2dae7bdeb2359 +SHA512 (recoll-1.40.3.tar.gz) = 1f374e2f3ff721cdacd146d96e404d59554587ec30da63ffda8c9075a0b4407f70714e96a2ab3d7963f5d848096e5f295dc80bd7254ad8109e1e93732a8556a2 From ef7b102063bef3b20b6ec68ac1719e0f66f9db0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sat, 16 Nov 2024 15:11:16 +0100 Subject: [PATCH 44/67] 1.40.4 1.40.4 1.40.4 1.40.4 1.40.4 1.40.4 --- .gitignore | 1 + recoll.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 44403ea..4869d71 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ recoll-1.13.04.tar.gz /recoll-1.40.0.tar.gz /recoll-1.40.1.tar.gz /recoll-1.40.3.tar.gz +/recoll-1.40.4.tar.gz diff --git a/recoll.spec b/recoll.spec index 42d8ca6..0ec1a8b 100644 --- a/recoll.spec +++ b/recoll.spec @@ -3,7 +3,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.40.3 +Version: 1.40.4 Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -84,7 +84,6 @@ This package contains the Recoll GNOME Shell search provider %prep %setup -q -D -a 1 -%autopatch -p1 sed -i -e '1{\,^#!/usr/bin/env,d}' python/recoll/recoll/rclconfig.py ln -s gssp-recoll-%{gsspver} gssp @@ -154,7 +153,7 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %files %license COPYING -%doc ChangeLog README +%doc README %{_sysconfdir}/ld.so.conf.d/recoll-%{_arch}.conf %{_bindir}/recoll %{_bindir}/recollindex @@ -163,6 +162,7 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/metainfo/org.recoll.recoll.appdata.xml %{_datadir}/applications/recoll-searchgui.desktop %{_datadir}/icons/hicolor/48x48/apps/recoll.png +%{_datadir}/icons/hicolor/scalable/apps/recoll.svg %{_datadir}/pixmaps/recoll.png %{python3_sitearch}/recoll %{python3_sitearch}/recollchm @@ -203,6 +203,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Nov 16 2024 Terje Rosten - 1.40.4-1 +- 1.40.4 + * Tue Oct 15 2024 Terje Rosten - 1.40.3-1 - 1.40.3 diff --git a/sources b/sources index 9272279..6843b18 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 -SHA512 (recoll-1.40.3.tar.gz) = 1f374e2f3ff721cdacd146d96e404d59554587ec30da63ffda8c9075a0b4407f70714e96a2ab3d7963f5d848096e5f295dc80bd7254ad8109e1e93732a8556a2 +SHA512 (recoll-1.40.4.tar.gz) = bf174f2e13b7137a71ae8d9b484cdeeaf5b7c63d4c00b0fe1fe8431448c60a92e1ec623fb715063df5c44a759a88f43785fd908ab30791010f9a33e2cfaee732 From 8f3560f338497e9368d5220cc0aeae7f238a14ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 22:13:48 +0000 Subject: [PATCH 45/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 0ec1a8b..97745b9 100644 --- a/recoll.spec +++ b/recoll.spec @@ -4,7 +4,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.40.4 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -203,6 +203,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.40.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Nov 16 2024 Terje Rosten - 1.40.4-1 - 1.40.4 From aaec99e7fccc3541c4df159a85f6fde2d621f96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 2 Mar 2025 12:00:47 +0100 Subject: [PATCH 46/67] 1.42.1 Fix build issue with GCC 15 1.42.1 Fix build issue with GCC 15 1.42.1 Fix build issue with GCC 15 1.42.1 Fix build issue with GCC 15 1.42.1 Fix build issue with GCC 15 1.42.1 Fix build issue with GCC 15 --- .gitignore | 1 + recoll-1.42.1-cmake4.patch | 10 ++++++++++ recoll-1.42.1-include.patch | 12 ++++++++++++ recoll.spec | 27 +++++++++++++++++++++------ sources | 2 +- 5 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 recoll-1.42.1-cmake4.patch create mode 100644 recoll-1.42.1-include.patch diff --git a/.gitignore b/.gitignore index 4869d71..18fe56a 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ recoll-1.13.04.tar.gz /recoll-1.40.1.tar.gz /recoll-1.40.3.tar.gz /recoll-1.40.4.tar.gz +/recoll-1.42.1.tar.gz diff --git a/recoll-1.42.1-cmake4.patch b/recoll-1.42.1-cmake4.patch new file mode 100644 index 0000000..a917cd9 --- /dev/null +++ b/recoll-1.42.1-cmake4.patch @@ -0,0 +1,10 @@ +diff --git i/kde/kioslave/kio_recoll-kde4/CMakeLists.txt w/kde/kioslave/kio_recoll-kde4/CMakeLists.txt +index 830f987..529151e 100644 +--- i/kde/kioslave/kio_recoll-kde4/CMakeLists.txt ++++ w/kde/kioslave/kio_recoll-kde4/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.6) + + project(kio_recoll) + diff --git a/recoll-1.42.1-include.patch b/recoll-1.42.1-include.patch new file mode 100644 index 0000000..27c8056 --- /dev/null +++ b/recoll-1.42.1-include.patch @@ -0,0 +1,12 @@ +diff --git a/common/rclconfig.h b/common/rclconfig.h +index 33689c4..952b088 100644 +--- a/common/rclconfig.h ++++ b/common/rclconfig.h +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + class ParamStale; + class ConfSimple; diff --git a/recoll.spec b/recoll.spec index 97745b9..ca2cac4 100644 --- a/recoll.spec +++ b/recoll.spec @@ -1,16 +1,22 @@ %global gsspver 1.1.3 %global __cmake_in_source_build 1 +%if 0%{?fedora} < 42 && 0%{?rhel} < 11 +%global kio4 1 +%endif + Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.40.4 -Release: 2%{?dist} +Version: 1.42.1 +Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/src/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh +Patch: recoll-1.42.1-include.patch +Patch: recoll-1.42.1-cmake4.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -19,7 +25,7 @@ BuildRequires: extra-cmake-modules BuildRequires: file-devel BuildRequires: gcc-c++ # kio -BuildRequires: kdelibs4-devel +%{?kio4:BuildRequires: kdelibs4-devel} BuildRequires: kf5-kio-devel # krunner BuildRequires: kf5-ki18n-devel @@ -36,6 +42,7 @@ BuildRequires: python3-setuptools BuildRequires: qt5-linguist BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtwebkit-devel +BuildRequires: systemd-rpm-macros BuildRequires: xapian-core-devel BuildRequires: zlib-devel Requires: xdg-utils @@ -83,7 +90,7 @@ Requires: python3-pydbus This package contains the Recoll GNOME Shell search provider %prep -%setup -q -D -a 1 +%autosetup -p1 -D -a 1 sed -i -e '1{\,^#!/usr/bin/env,d}' python/recoll/recoll/rclconfig.py ln -s gssp-recoll-%{gsspver} gssp @@ -123,13 +130,15 @@ pushd kde/kioslave/kio_recoll %cmake_install popd +%if 0%{?kio4} # kio_recoll -kde4 export QMAKE=qmake-qt4 pushd kde/kioslave/kio_recoll-kde4 -%cmake_kde4 -DRECOLL_PUBLIC_LIB=1 +%cmake_kde4 -DRECOLL_PUBLIC_LIB=1 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 %cmake_build %cmake_install popd +%endif # krunner_recoll pushd kde/krunner @@ -184,11 +193,13 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %files kio %license COPYING -%{_libdir}/kde4/kio_recoll.so %{_libdir}/qt5/plugins/kf5/kio/kio_recoll.so +%if 0%{?kio4} +%{_libdir}/kde4/kio_recoll.so %{_datadir}/kde4/apps/kio_recoll/ %{_datadir}/kde4/services/recoll.protocol %{_datadir}/kde4/services/recollf.protocol +%endif %{_datadir}/kio_recoll/help.html %{_datadir}/kio_recoll/welcome.html @@ -203,6 +214,10 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Mar 01 2025 Terje Rosten - 1.42.4-1 +- 1.42.1 +- Fix build issue with GCC 15 + * Sat Jan 18 2025 Fedora Release Engineering - 1.40.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 6843b18..0986b8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (recoll-1.42.1.tar.gz) = 45143a5db5e8a44b238294acef9f77c014b86efd0e61053bb9036677a79c9e43a6bc890ef2df415a877631fc3ec22b1e8abe9754aae297e20716a6696a28656c SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 -SHA512 (recoll-1.40.4.tar.gz) = bf174f2e13b7137a71ae8d9b484cdeeaf5b7c63d4c00b0fe1fe8431448c60a92e1ec623fb715063df5c44a759a88f43785fd908ab30791010f9a33e2cfaee732 From c01773e1c4f4dfb9ad7bbdb7df8486e3b7546b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sat, 29 Mar 2025 15:53:30 +0100 Subject: [PATCH 47/67] 1.43.0 --- .gitignore | 1 + recoll-1.42.1-include.patch | 12 ------------ recoll.spec | 6 ++++-- sources | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 recoll-1.42.1-include.patch diff --git a/.gitignore b/.gitignore index 18fe56a..321c4ce 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ recoll-1.13.04.tar.gz /recoll-1.40.3.tar.gz /recoll-1.40.4.tar.gz /recoll-1.42.1.tar.gz +/recoll-1.43.0.tar.gz diff --git a/recoll-1.42.1-include.patch b/recoll-1.42.1-include.patch deleted file mode 100644 index 27c8056..0000000 --- a/recoll-1.42.1-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/common/rclconfig.h b/common/rclconfig.h -index 33689c4..952b088 100644 ---- a/common/rclconfig.h -+++ b/common/rclconfig.h -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - class ParamStale; - class ConfSimple; diff --git a/recoll.spec b/recoll.spec index ca2cac4..863a1a9 100644 --- a/recoll.spec +++ b/recoll.spec @@ -7,7 +7,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.42.1 +Version: 1.43.0 Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -15,7 +15,6 @@ URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/src/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt5.sh -Patch: recoll-1.42.1-include.patch Patch: recoll-1.42.1-cmake4.patch BuildRequires: aspell-devel BuildRequires: bison @@ -214,6 +213,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Mar 29 2025 Terje Rosten - 1.43.0-1 +- 1.43.0 + * Sat Mar 01 2025 Terje Rosten - 1.42.4-1 - 1.42.1 - Fix build issue with GCC 15 diff --git a/sources b/sources index 0986b8a..e258396 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.42.1.tar.gz) = 45143a5db5e8a44b238294acef9f77c014b86efd0e61053bb9036677a79c9e43a6bc890ef2df415a877631fc3ec22b1e8abe9754aae297e20716a6696a28656c +SHA512 (recoll-1.43.0.tar.gz) = 1bffe39ef6339f111604720b058b5a9f0df4de5590d9253ff4d89fdb535c17a6d75d9bf7d843ddb735fcb27b64d5c42797c6321ac40845a8eae6d2f0fec08c0f SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From 9dcaa069ebbf672ac0f129d3da7986c2eaa3c20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 8 May 2025 21:12:20 +0200 Subject: [PATCH 48/67] 1.43.2 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 321c4ce..0dcbf96 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ recoll-1.13.04.tar.gz /recoll-1.40.4.tar.gz /recoll-1.42.1.tar.gz /recoll-1.43.0.tar.gz +/recoll-1.43.2.tar.gz diff --git a/recoll.spec b/recoll.spec index 863a1a9..79822a4 100644 --- a/recoll.spec +++ b/recoll.spec @@ -7,7 +7,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.43.0 +Version: 1.43.2 Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -213,6 +213,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Thu May 08 2025 Terje Rosten - 1.43.2-1 +- 1.43.2 + * Sat Mar 29 2025 Terje Rosten - 1.43.0-1 - 1.43.0 diff --git a/sources b/sources index e258396..e6f8b8f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.43.0.tar.gz) = 1bffe39ef6339f111604720b058b5a9f0df4de5590d9253ff4d89fdb535c17a6d75d9bf7d843ddb735fcb27b64d5c42797c6321ac40845a8eae6d2f0fec08c0f +SHA512 (recoll-1.43.2.tar.gz) = 73f8f7f7acf0db53fdb9e9bb7c5f606d3f1ee460a54a94dde5bb585f5e25b22f144a2f8015fa61254ff662b6774a2c8e0fcd123ef46ccfa4fa180ddec513c920 SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From 80e85fd62f76c8c1b8a8352180234555f58718cc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 22:56:25 +0200 Subject: [PATCH 49/67] Rebuilt for Python 3.14 --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 79822a4..f9a340b 100644 --- a/recoll.spec +++ b/recoll.spec @@ -8,7 +8,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.2 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -213,6 +213,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Jun 02 2025 Python Maint - 1.43.2-2 +- Rebuilt for Python 3.14 + * Thu May 08 2025 Terje Rosten - 1.43.2-1 - 1.43.2 From fae76ff3db4df3c3e3fd077592b2479a9143a48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 7 Jul 2025 18:47:59 +0200 Subject: [PATCH 50/67] 1.43.3 --- .gitignore | 1 + recoll.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0dcbf96..8b07609 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ recoll-1.13.04.tar.gz /recoll-1.42.1.tar.gz /recoll-1.43.0.tar.gz /recoll-1.43.2.tar.gz +/recoll-1.43.3.tar.gz diff --git a/recoll.spec b/recoll.spec index f9a340b..15dcb1e 100644 --- a/recoll.spec +++ b/recoll.spec @@ -7,8 +7,8 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.43.2 -Release: 2%{?dist} +Version: 1.43.3 +Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -213,6 +213,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Jul 05 2025 Terje Rosten - 1.43.3-1 +- 1.43.3 + * Mon Jun 02 2025 Python Maint - 1.43.2-2 - Rebuilt for Python 3.14 diff --git a/sources b/sources index e6f8b8f..67943ff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.43.2.tar.gz) = 73f8f7f7acf0db53fdb9e9bb7c5f606d3f1ee460a54a94dde5bb585f5e25b22f144a2f8015fa61254ff662b6774a2c8e0fcd123ef46ccfa4fa180ddec513c920 +SHA512 (recoll-1.43.3.tar.gz) = f255f44a0f5a91e5b4d1935230f20398e98b220d783231049d8ba22532aa3a5a8e08c3316185a8905a6d8a69389acdb804ea0e48f22ee3955c92cc4fe1c1bd96 SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From ed6d5cabb73556753163b378322d02ca789184dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 11:50:52 +0000 Subject: [PATCH 51/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 15dcb1e..a0807f3 100644 --- a/recoll.spec +++ b/recoll.spec @@ -8,7 +8,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.3 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -213,6 +213,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.43.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 05 2025 Terje Rosten - 1.43.3-1 - 1.43.3 From 6ca97b7191e1109b86e9f933b12500e0193d67b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 10 Aug 2025 13:37:11 +0200 Subject: [PATCH 52/67] 1.43.4 --- .gitignore | 1 + recoll.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b07609..86fe63c 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ recoll-1.13.04.tar.gz /recoll-1.43.0.tar.gz /recoll-1.43.2.tar.gz /recoll-1.43.3.tar.gz +/recoll-1.43.4.tar.gz diff --git a/recoll.spec b/recoll.spec index a0807f3..722c79a 100644 --- a/recoll.spec +++ b/recoll.spec @@ -7,8 +7,8 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.43.3 -Release: 2%{?dist} +Version: 1.43.4 +Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -213,6 +213,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Aug 10 2025 Terje Rosten - 1.43.4-1 +- 1.43.4 + * Fri Jul 25 2025 Fedora Release Engineering - 1.43.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 67943ff..cac5b87 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.43.3.tar.gz) = f255f44a0f5a91e5b4d1935230f20398e98b220d783231049d8ba22532aa3a5a8e08c3316185a8905a6d8a69389acdb804ea0e48f22ee3955c92cc4fe1c1bd96 +SHA512 (recoll-1.43.4.tar.gz) = 26c5cb0dee5f396bc0827db8aacfb91b433b5e06c784ce7f14d9670d72760259d4793c775015c990f741a2f567f34b3760fbce8db86b1a8ff3401627c5b0a32a SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From d3d5a15f68f7800f56e4097dec4c0f01cbb29524 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:15:21 +0200 Subject: [PATCH 53/67] Rebuilt for Python 3.14.0rc2 bytecode --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 722c79a..c19732f 100644 --- a/recoll.spec +++ b/recoll.spec @@ -8,7 +8,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.4 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -213,6 +213,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Fri Aug 15 2025 Python Maint - 1.43.4-2 +- Rebuilt for Python 3.14.0rc2 bytecode + * Sun Aug 10 2025 Terje Rosten - 1.43.4-1 - 1.43.4 From f7e76b2b142b8bf523ebbb4d80f95781586e7ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 21 Aug 2025 19:26:32 +0200 Subject: [PATCH 54/67] Bump to qt6 and kf6 --- qmake-qt5.sh => qmake-qt6.sh | 2 +- recoll.spec | 39 ++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 18 deletions(-) rename qmake-qt5.sh => qmake-qt6.sh (87%) diff --git a/qmake-qt5.sh b/qmake-qt6.sh similarity index 87% rename from qmake-qt5.sh rename to qmake-qt6.sh index 09d9fe6..0770bcf 100755 --- a/qmake-qt5.sh +++ b/qmake-qt6.sh @@ -1,6 +1,6 @@ #!/bin/sh -/usr/bin/qmake-qt5 \ +/usr/bin/qmake6 \ "$@" \ QMAKE_CFLAGS_RELEASE="${CFLAGS}" \ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \ diff --git a/recoll.spec b/recoll.spec index c19732f..a5ce855 100644 --- a/recoll.spec +++ b/recoll.spec @@ -8,13 +8,13 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.4 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/src/gssp-recoll-%{gsspver}.tar.gz -Source10: qmake-qt5.sh +Source10: qmake-qt6.sh Patch: recoll-1.42.1-cmake4.patch BuildRequires: aspell-devel BuildRequires: bison @@ -25,12 +25,12 @@ BuildRequires: file-devel BuildRequires: gcc-c++ # kio %{?kio4:BuildRequires: kdelibs4-devel} -BuildRequires: kf5-kio-devel +BuildRequires: kf6-kio-devel # krunner -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-krunner-devel -BuildRequires: kf5-knotifications-devel -BuildRequires: kf5-kpackage-devel +BuildRequires: kf6-ki18n-devel +BuildRequires: kf6-krunner-devel +BuildRequires: kf6-knotifications-devel +BuildRequires: kf6-kpackage-devel BuildRequires: libxslt-devel BuildRequires: make @@ -38,9 +38,9 @@ BuildRequires: meson BuildRequires: python-rpm-macros BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: qt5-linguist -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtwebkit-devel +BuildRequires: qt6-linguist +BuildRequires: qt6-qtbase-devel +BuildRequires: qtwebkit-devel BuildRequires: systemd-rpm-macros BuildRequires: xapian-core-devel BuildRequires: zlib-devel @@ -99,9 +99,9 @@ CXXFLAGS="%{optflags}"; export CXXFLAGS LDFLAGS="%{?__global_ldflags}"; export LDFLAGS # force use of custom/local qmake, to inject proper build flags (above) -install -m755 -D %{SOURCE10} qmake-qt5.sh -export QMAKE=$(pwd)/qmake-qt5.sh -%meson -Drecollq=true -Dsystemd=true +install -m755 -D %{SOURCE10} qmake-qt6.sh +export QMAKE=$(pwd)/qmake-qt6.sh +%meson -Drecollq=true -Dsystemd=true -Dwebkit=false %meson_build # gssp @@ -124,7 +124,8 @@ export RECOLL_LIB_DIR=%{_builddir}/%{name}-%{version}/redhat-linux-build/ # kio_recoll -kde5 pushd kde/kioslave/kio_recoll -%cmake -DRECOLL_PUBLIC_LIB=1 +cp CMakeLists-KF6.txt CMakeLists.txt +%cmake -DRECOLL_PUBLIC_LIB=1 -DQT_MAJOR_VERSION=6 %cmake_build %cmake_install popd @@ -141,7 +142,8 @@ popd # krunner_recoll pushd kde/krunner -%cmake -DRECOLL_PUBLIC_LIB=1 +cp CMakeLists-KF6.txt CMakeLists.txt +%cmake -DRECOLL_PUBLIC_LIB=1 -DQT_MAJOR_VERSION=6 %cmake_build %cmake_install popd @@ -192,7 +194,7 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %files kio %license COPYING -%{_libdir}/qt5/plugins/kf5/kio/kio_recoll.so +%{_libdir}/qt6/plugins/kf6/kio/kio_recoll.so %if 0%{?kio4} %{_libdir}/kde4/kio_recoll.so %{_datadir}/kde4/apps/kio_recoll/ @@ -203,7 +205,7 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/kio_recoll/welcome.html %files krunner -%{_libdir}/qt5/plugins/kf5/krunner/krunner_recoll.so +%{_libdir}/qt6/plugins/kf6/krunner/krunner_recoll.so %files gssp %license COPYING @@ -213,6 +215,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Thu Aug 21 2025 Terje Rosten - 1.43.4-3 +- Bump to qt6 and kf6 + * Fri Aug 15 2025 Python Maint - 1.43.4-2 - Rebuilt for Python 3.14.0rc2 bytecode From 97c7e352924b47e6c4029cc9a270aba6b0a0b316 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Tue, 26 Aug 2025 09:32:37 -0400 Subject: [PATCH 55/67] Remove unused QtWebKit from BuildRequires --- recoll.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recoll.spec b/recoll.spec index a5ce855..c70c7e9 100644 --- a/recoll.spec +++ b/recoll.spec @@ -8,7 +8,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.4 -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -40,7 +40,6 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: qt6-linguist BuildRequires: qt6-qtbase-devel -BuildRequires: qtwebkit-devel BuildRequires: systemd-rpm-macros BuildRequires: xapian-core-devel BuildRequires: zlib-devel @@ -215,6 +214,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Tue Aug 26 2025 FeRD (Frank Dana) - 1.43.4-4 +- Remove QtWebKit from build requirements, no longer used + * Thu Aug 21 2025 Terje Rosten - 1.43.4-3 - Bump to qt6 and kf6 From fa44c1bdf7f1593169b36689f9f42a7595137efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sat, 30 Aug 2025 10:20:10 +0200 Subject: [PATCH 56/67] 1.43.5 --- .gitignore | 1 + recoll.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 86fe63c..2833c5f 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ recoll-1.13.04.tar.gz /recoll-1.43.2.tar.gz /recoll-1.43.3.tar.gz /recoll-1.43.4.tar.gz +/recoll-1.43.5.tar.gz diff --git a/recoll.spec b/recoll.spec index c70c7e9..2785562 100644 --- a/recoll.spec +++ b/recoll.spec @@ -5,10 +5,14 @@ %global kio4 1 %endif +%ifnarch %{ix86} s390x +%global qtweb 1 +%endif + Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.43.4 -Release: 4%{?dist} +Version: 1.43.5 +Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -40,6 +44,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: qt6-linguist BuildRequires: qt6-qtbase-devel +%{?qtweb:BuildRequires: qt6-qtwebengine-devel} BuildRequires: systemd-rpm-macros BuildRequires: xapian-core-devel BuildRequires: zlib-devel @@ -100,7 +105,7 @@ LDFLAGS="%{?__global_ldflags}"; export LDFLAGS # force use of custom/local qmake, to inject proper build flags (above) install -m755 -D %{SOURCE10} qmake-qt6.sh export QMAKE=$(pwd)/qmake-qt6.sh -%meson -Drecollq=true -Dsystemd=true -Dwebkit=false +%meson -Drecollq=true -Dsystemd=true %{?qtweb:-Dwebengine=true} -Dwebkit=false %meson_build # gssp @@ -214,6 +219,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Aug 30 2025 Terje Rosten - 1.43.5-1 +- 1.43.5 + * Tue Aug 26 2025 FeRD (Frank Dana) - 1.43.4-4 - Remove QtWebKit from build requirements, no longer used diff --git a/sources b/sources index cac5b87..85d9995 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.43.4.tar.gz) = 26c5cb0dee5f396bc0827db8aacfb91b433b5e06c784ce7f14d9670d72760259d4793c775015c990f741a2f567f34b3760fbce8db86b1a8ff3401627c5b0a32a +SHA512 (recoll-1.43.5.tar.gz) = d121407763393a84574400625998f5836207e68050a15984af790b243b27a1f10b63597c37ce065fc23fdfc888fb9d7566688d29ca518fe96519bed0ca24fdc3 SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From 8b9e938a5abd914c4fbfadfe35d8c38997b275eb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:52:48 +0200 Subject: [PATCH 57/67] Rebuilt for Python 3.14.0rc3 bytecode --- recoll.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 2785562..79c8ada 100644 --- a/recoll.spec +++ b/recoll.spec @@ -12,7 +12,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.5 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -219,6 +219,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Fri Sep 19 2025 Python Maint - 1.43.5-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Sat Aug 30 2025 Terje Rosten - 1.43.5-1 - 1.43.5 From 01f484207813fb59ad8e7fe6eb289d452c7246a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 22 Sep 2025 12:04:16 +0200 Subject: [PATCH 58/67] Add helpers subpackage and supplements and recommends (forward and backwards weak deps) for kf6-krunner package. --- recoll.spec | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/recoll.spec b/recoll.spec index 79c8ada..b2edadc 100644 --- a/recoll.spec +++ b/recoll.spec @@ -12,7 +12,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.5 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -35,7 +35,6 @@ BuildRequires: kf6-ki18n-devel BuildRequires: kf6-krunner-devel BuildRequires: kf6-knotifications-devel BuildRequires: kf6-kpackage-devel - BuildRequires: libxslt-devel BuildRequires: make BuildRequires: meson @@ -49,7 +48,8 @@ BuildRequires: systemd-rpm-macros BuildRequires: xapian-core-devel BuildRequires: zlib-devel Requires: xdg-utils - +Recommends: (recoll-krunner if kf6-krunner) +Suggests: %{name}-helpers = %{version}-%{release} %description Recoll is a personal full text search package for Linux, FreeBSD and other Unix systems. It is based on a very strong back end (Xapian), for @@ -68,6 +68,23 @@ Requires: %{name}-libs = %{version}-%{release} Libraries and header files required to develop Recoll enabled applications. +%package helpers +Summary: External helpers to make recoll understand more document formats +Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Recommends: djvulibre +Recommends: ghostscript +Recommends: info +Recommends: libwpd-tools +Recommends: python-chardet +Recommends: python-rarfile +Recommends: python3-mutagen +Suggests: chmlib +Suggests: texlive-detex +%description helpers +Package will bring in a set of external helpers to make recoll able to parse and extract +information from various data formats + %package kio Summary: KIO support for recoll Requires: %{name} = %{version}-%{release} @@ -80,7 +97,7 @@ displayed in Konqueror. %package krunner Summary: KRunner support for recoll Requires: %{name} = %{version}-%{release} - +Supplements: (kf6-krunner and recoll) %description krunner The recoll KRunner plugin adds Recoll search results to KRunner output. @@ -196,6 +213,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_libdir}/librecoll.so %{_includedir}/recoll +%files helpers +%license COPYING + %files kio %license COPYING %{_libdir}/qt6/plugins/kf6/kio/kio_recoll.so @@ -219,6 +239,10 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Sep 22 2025 Terje Rosten - 1.43.5-3 +- Add helpers subpackage +- Add Supplements in krunner subpackage + * Fri Sep 19 2025 Python Maint - 1.43.5-2 - Rebuilt for Python 3.14.0rc3 bytecode From fc351dc66e91fb77647a6199f1aa74cc85baff3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 22 Sep 2025 18:23:25 +0200 Subject: [PATCH 59/67] Fix changelog --- recoll.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index b2edadc..9986e2a 100644 --- a/recoll.spec +++ b/recoll.spec @@ -241,7 +241,8 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %changelog * Mon Sep 22 2025 Terje Rosten - 1.43.5-3 - Add helpers subpackage -- Add Supplements in krunner subpackage +- Add wek deps: conditional recommends on recoll-krunner if + kf6-krunner is present and corresponding backwards conditional supplements * Fri Sep 19 2025 Python Maint - 1.43.5-2 - Rebuilt for Python 3.14.0rc3 bytecode From ca867f7a4b413536c3beef735b99ba1e1ff76cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 23 Sep 2025 17:57:39 +0200 Subject: [PATCH 60/67] Add more helpers Add dep on kio in krunner --- recoll.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/recoll.spec b/recoll.spec index 9986e2a..a10f106 100644 --- a/recoll.spec +++ b/recoll.spec @@ -12,7 +12,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.5 -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -72,13 +72,18 @@ applications. Summary: External helpers to make recoll understand more document formats Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release} +Recommends: antiword Recommends: djvulibre Recommends: ghostscript Recommends: info Recommends: libwpd-tools +Recommends: perl-Image-ExifTool +Recommends: poppler-utils Recommends: python-chardet Recommends: python-rarfile Recommends: python3-mutagen +Recommends: unrtf +Recommends: wv Suggests: chmlib Suggests: texlive-detex %description helpers @@ -97,6 +102,7 @@ displayed in Konqueror. %package krunner Summary: KRunner support for recoll Requires: %{name} = %{version}-%{release} +Requires: %{name}-kio = %{version}-%{release} Supplements: (kf6-krunner and recoll) %description krunner The recoll KRunner plugin adds Recoll search results to KRunner output. @@ -239,6 +245,10 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Tue Sep 23 2025 Terje Rosten - 1.43.5-4 +- Add more helpers +- Add dep on kio in krunner + * Mon Sep 22 2025 Terje Rosten - 1.43.5-3 - Add helpers subpackage - Add wek deps: conditional recommends on recoll-krunner if From 31ebc929d7edc868e8b9cc80a6824fb9e69b989c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 25 Sep 2025 18:51:04 +0200 Subject: [PATCH 61/67] Add soffice patch Prefer Recommends over Suggests --- recoll-1.43.4-soffice.patch | 13 +++++++++++++ recoll.spec | 9 +++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 recoll-1.43.4-soffice.patch diff --git a/recoll-1.43.4-soffice.patch b/recoll-1.43.4-soffice.patch new file mode 100644 index 0000000..74356fb --- /dev/null +++ b/recoll-1.43.4-soffice.patch @@ -0,0 +1,13 @@ +diff --git a/filters/rclrunsoffice.py b/filters/rclrunsoffice.py +index 4f3b2d5..b297d75 100644 +--- a/filters/rclrunsoffice.py ++++ b/filters/rclrunsoffice.py +@@ -41,6 +41,8 @@ class SofficeRunner(object): + infn = os.path.basename(inpath) + inbase = os.path.splitext(infn)[0] + htmlfn = os.path.join(self.tmpdir.getpath().encode("UTF-8"), inbase) + b".html" ++ if not os.path.exists(htmlfn): ++ return "" + return open(htmlfn).read() + + diff --git a/recoll.spec b/recoll.spec index a10f106..936ca6b 100644 --- a/recoll.spec +++ b/recoll.spec @@ -12,7 +12,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.5 -Release: 4%{?dist} +Release: 5%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -20,6 +20,7 @@ Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/src/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt6.sh Patch: recoll-1.42.1-cmake4.patch +Patch: recoll-1.43.4-soffice.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -49,7 +50,7 @@ BuildRequires: xapian-core-devel BuildRequires: zlib-devel Requires: xdg-utils Recommends: (recoll-krunner if kf6-krunner) -Suggests: %{name}-helpers = %{version}-%{release} +Recommends: %{name}-helpers = %{version}-%{release} %description Recoll is a personal full text search package for Linux, FreeBSD and other Unix systems. It is based on a very strong back end (Xapian), for @@ -245,6 +246,10 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Thu Sep 25 2025 Terje Rosten - 1.43.5-5 +- Add soffice patch +- Prefer Recommends over Suggests + * Tue Sep 23 2025 Terje Rosten - 1.43.5-4 - Add more helpers - Add dep on kio in krunner From c6ca12cec48896543832307f40a1e6a96ced1023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 28 Sep 2025 11:30:42 +0200 Subject: [PATCH 62/67] Add forward and backwards weak deps in -gssp subpackage to gnome-shell Remove wrong req. on -kio Let -kio subpackage Supplement kf6-kio-core --- recoll.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recoll.spec b/recoll.spec index 936ca6b..3f6db99 100644 --- a/recoll.spec +++ b/recoll.spec @@ -12,7 +12,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.5 -Release: 5%{?dist} +Release: 6%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -50,6 +50,7 @@ BuildRequires: xapian-core-devel BuildRequires: zlib-devel Requires: xdg-utils Recommends: (recoll-krunner if kf6-krunner) +Recommends: (recoll-gssp if gnome-shell) Recommends: %{name}-helpers = %{version}-%{release} %description Recoll is a personal full text search package for Linux, FreeBSD and @@ -94,6 +95,7 @@ information from various data formats %package kio Summary: KIO support for recoll Requires: %{name} = %{version}-%{release} +Supplements: (kf6-kio-core and recoll) %description kio The recoll KIO slave allows performing a recoll search by entering an @@ -103,7 +105,6 @@ displayed in Konqueror. %package krunner Summary: KRunner support for recoll Requires: %{name} = %{version}-%{release} -Requires: %{name}-kio = %{version}-%{release} Supplements: (kf6-krunner and recoll) %description krunner The recoll KRunner plugin adds Recoll search results to KRunner output. @@ -113,6 +114,7 @@ Summary: Recoll GNOME Shell search provider Requires: %{name} = %{version}-%{release} Requires: gnome-shell Requires: python3-pydbus +Supplements: (gnome-shell and recoll) %description gssp This package contains the Recoll GNOME Shell search provider @@ -246,6 +248,11 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Sep 28 2025 Terje Rosten - 1.43.5-6 +- Add forward and backwards weak deps in -gssp subpackage to gnome-shell +- Remove wrong req. on -kio +- Let -kio subpackage Supplement kf6-kio-core + * Thu Sep 25 2025 Terje Rosten - 1.43.5-5 - Add soffice patch - Prefer Recommends over Suggests From 9f229e0659fb4b00cd7fd6b401fd4fa7d99fc347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 30 Sep 2025 22:42:59 +0200 Subject: [PATCH 63/67] Add support for el10 --- recoll.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/recoll.spec b/recoll.spec index 3f6db99..0c61274 100644 --- a/recoll.spec +++ b/recoll.spec @@ -1,7 +1,7 @@ %global gsspver 1.1.3 %global __cmake_in_source_build 1 -%if 0%{?fedora} < 42 && 0%{?rhel} < 11 +%if 0%{?fedora} < 42 && 0%{?rhel} < 10 %global kio4 1 %endif @@ -9,10 +9,16 @@ %global qtweb 1 %endif +%if 0%{?rhel} > 9 +# pass +%else +%global chm 1 +%endif + Summary: Desktop full text search tool with Qt GUI Name: recoll Version: 1.43.5 -Release: 6%{?dist} +Release: 7%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -23,7 +29,7 @@ Patch: recoll-1.42.1-cmake4.patch Patch: recoll-1.43.4-soffice.patch BuildRequires: aspell-devel BuildRequires: bison -BuildRequires: chmlib-devel +%{?chm:BuildRequires: chmlib-devel} BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules BuildRequires: file-devel @@ -248,6 +254,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Sep 29 2025 Terje Rosten - 1.43.5-7 +- Add support for el10 + * Sun Sep 28 2025 Terje Rosten - 1.43.5-6 - Add forward and backwards weak deps in -gssp subpackage to gnome-shell - Remove wrong req. on -kio From 955a233ea4f34dd7513a91377875597f7a37e5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Wed, 8 Oct 2025 16:42:49 +0200 Subject: [PATCH 64/67] 1.43.6 --- .gitignore | 1 + recoll-1.43.4-soffice.patch | 13 ------------- recoll.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 recoll-1.43.4-soffice.patch diff --git a/.gitignore b/.gitignore index 2833c5f..761495c 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ recoll-1.13.04.tar.gz /recoll-1.43.3.tar.gz /recoll-1.43.4.tar.gz /recoll-1.43.5.tar.gz +/recoll-1.43.6.tar.gz diff --git a/recoll-1.43.4-soffice.patch b/recoll-1.43.4-soffice.patch deleted file mode 100644 index 74356fb..0000000 --- a/recoll-1.43.4-soffice.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/filters/rclrunsoffice.py b/filters/rclrunsoffice.py -index 4f3b2d5..b297d75 100644 ---- a/filters/rclrunsoffice.py -+++ b/filters/rclrunsoffice.py -@@ -41,6 +41,8 @@ class SofficeRunner(object): - infn = os.path.basename(inpath) - inbase = os.path.splitext(infn)[0] - htmlfn = os.path.join(self.tmpdir.getpath().encode("UTF-8"), inbase) + b".html" -+ if not os.path.exists(htmlfn): -+ return "" - return open(htmlfn).read() - - diff --git a/recoll.spec b/recoll.spec index 0c61274..39d7059 100644 --- a/recoll.spec +++ b/recoll.spec @@ -17,8 +17,8 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.43.5 -Release: 7%{?dist} +Version: 1.43.6 +Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://www.recoll.org @@ -26,7 +26,6 @@ Source0: https://www.recoll.org/recoll-%{version}.tar.gz Source1: https://www.recoll.org/downloads/src/gssp-recoll-%{gsspver}.tar.gz Source10: qmake-qt6.sh Patch: recoll-1.42.1-cmake4.patch -Patch: recoll-1.43.4-soffice.patch BuildRequires: aspell-devel BuildRequires: bison %{?chm:BuildRequires: chmlib-devel} @@ -254,6 +253,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Wed Oct 08 2025 Terje Rosten - 1.43.6-1 +- 1.43.6 + * Mon Sep 29 2025 Terje Rosten - 1.43.5-7 - Add support for el10 diff --git a/sources b/sources index 85d9995..21a1f57 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.43.5.tar.gz) = d121407763393a84574400625998f5836207e68050a15984af790b243b27a1f10b63597c37ce065fc23fdfc888fb9d7566688d29ca518fe96519bed0ca24fdc3 +SHA512 (recoll-1.43.6.tar.gz) = edadabd4bb4816868e109d59fed6607494731e2ca5a6765f58ff08fd45f5b1cbc96d827c458bc45901dafb9fe4b52d644df5d82491442ebe448d9fdc7875e3d1 SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From e64f50500978bfae9f58e8b332f95294e69a6d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Mon, 10 Nov 2025 15:35:26 +0100 Subject: [PATCH 65/67] 1.43.7 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 761495c..aa358e8 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ recoll-1.13.04.tar.gz /recoll-1.43.4.tar.gz /recoll-1.43.5.tar.gz /recoll-1.43.6.tar.gz +/recoll-1.43.7.tar.gz diff --git a/recoll.spec b/recoll.spec index 39d7059..9929f1b 100644 --- a/recoll.spec +++ b/recoll.spec @@ -17,7 +17,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.43.6 +Version: 1.43.7 Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -253,6 +253,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Mon Nov 10 2025 Terje Rosten - 1.43.7-1 +- 1.43.7 + * Wed Oct 08 2025 Terje Rosten - 1.43.6-1 - 1.43.6 diff --git a/sources b/sources index 21a1f57..9f1c55f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.43.6.tar.gz) = edadabd4bb4816868e109d59fed6607494731e2ca5a6765f58ff08fd45f5b1cbc96d827c458bc45901dafb9fe4b52d644df5d82491442ebe448d9fdc7875e3d1 +SHA512 (recoll-1.43.7.tar.gz) = 61d436e90af2e6008a717e2ce9d4ac406b12db6f116d062500a1306616ab186581fc3207470ce94ba6ecc6a922e45dd68bde99e9f312450e9a1b4ae227d5161b SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From 4e6d72d3f24c78eef7f6c2b7fd29ec0bf1be9e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sat, 20 Dec 2025 17:42:38 +0100 Subject: [PATCH 66/67] 1.43.8 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aa358e8..5df9149 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ recoll-1.13.04.tar.gz /recoll-1.43.5.tar.gz /recoll-1.43.6.tar.gz /recoll-1.43.7.tar.gz +/recoll-1.43.8.tar.gz diff --git a/recoll.spec b/recoll.spec index 9929f1b..a3d1fd1 100644 --- a/recoll.spec +++ b/recoll.spec @@ -17,7 +17,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.43.7 +Version: 1.43.8 Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -253,6 +253,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sat Dec 20 2025 Terje Rosten - 1.43.8-1 +- 1.43.8 + * Mon Nov 10 2025 Terje Rosten - 1.43.7-1 - 1.43.7 diff --git a/sources b/sources index 9f1c55f..6e4beb6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.43.7.tar.gz) = 61d436e90af2e6008a717e2ce9d4ac406b12db6f116d062500a1306616ab186581fc3207470ce94ba6ecc6a922e45dd68bde99e9f312450e9a1b4ae227d5161b +SHA512 (recoll-1.43.8.tar.gz) = 1aa16a068f0b68bf55af8ec903853fe675533576283b9656ea259be1ee5ee24d2117e6bdd999a662ad25a89620714a12a94b4c7ae4661b12e92a0a500199e091 SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8 From 3358cb9f88a8179652245c224c128e7f6970f7ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 4 Jan 2026 20:22:06 +0100 Subject: [PATCH 67/67] 1.43.9 --- .gitignore | 1 + recoll.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5df9149..43153b0 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ recoll-1.13.04.tar.gz /recoll-1.43.6.tar.gz /recoll-1.43.7.tar.gz /recoll-1.43.8.tar.gz +/recoll-1.43.9.tar.gz diff --git a/recoll.spec b/recoll.spec index a3d1fd1..cd321e6 100644 --- a/recoll.spec +++ b/recoll.spec @@ -17,7 +17,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.43.8 +Version: 1.43.9 Release: 1%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -253,6 +253,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arc %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* Sun Jan 04 2026 Terje Rosten - 1.43.9-1 +- 1.43.9 + * Sat Dec 20 2025 Terje Rosten - 1.43.8-1 - 1.43.8 diff --git a/sources b/sources index 6e4beb6..5900a01 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.43.8.tar.gz) = 1aa16a068f0b68bf55af8ec903853fe675533576283b9656ea259be1ee5ee24d2117e6bdd999a662ad25a89620714a12a94b4c7ae4661b12e92a0a500199e091 +SHA512 (recoll-1.43.9.tar.gz) = 7dd8d70c3b51056a067f83df7ca2b46bb1663c0074b42949b9e0a9da03e4cbba3bc9182b93935f9d3b34693229841fe2162a4224bbcd0c4610d1dd550a18deb0 SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8