1.43.9

Remove wrong req. on -kio
Let -kio subpackage Supplement kf6-kio-core

.gitignore

@@ -86,3 +86,11 @@ 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
+/recoll-1.43.3.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
+/recoll-1.43.8.tar.gz
+/recoll-1.43.9.tar.gz

qmake-qt6.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/usr/bin/qmake-qt5 \
+/usr/bin/qmake6 \
   "$@" \
   QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
   QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \

recoll.spec

@@ -1,51 +1,62 @@
 %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
 
+%ifnarch %{ix86} s390x
+%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.0
+Version:        1.43.9
 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
+Source10:       qmake-qt6.sh
 Patch:          recoll-1.42.1-cmake4.patch
 BuildRequires:  aspell-devel
 BuildRequires:  bison
-BuildRequires:  chmlib-devel
+%{?chm:BuildRequires:  chmlib-devel}
 BuildRequires:  desktop-file-utils
 BuildRequires:  extra-cmake-modules
 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
 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
+%{?qtweb:BuildRequires:  qt6-qtwebengine-devel}
 BuildRequires:  systemd-rpm-macros
 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
 other Unix systems. It is based on a very strong back end (Xapian), for
@@ -64,9 +75,32 @@ 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:    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
+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}
+Supplements:   (kf6-kio-core and recoll)
 
 %description   kio
 The recoll KIO slave allows performing a recoll search by entering an
@@ -76,7 +110,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.
 
@@ -85,6 +119,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
 
@@ -99,9 +134,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 %{?qtweb:-Dwebengine=true} -Dwebkit=false
 %meson_build
 
 # gssp
@@ -124,7 +159,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 +177,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
@@ -190,9 +227,12 @@ 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}/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 +243,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 +253,69 @@ 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 <terjeros@gmail.com> - 1.43.9-1
+- 1.43.9
+
+* Sat Dec 20 2025 Terje Rosten <terjeros@gmail.com> - 1.43.8-1
+- 1.43.8
+
+* Mon Nov 10 2025 Terje Rosten <terjeros@gmail.com> - 1.43.7-1
+- 1.43.7
+
+* Wed Oct 08 2025 Terje Rosten <terjeros@gmail.com> - 1.43.6-1
+- 1.43.6
+
+* Mon Sep 29 2025 Terje Rosten <terjeros@gmail.com> - 1.43.5-7
+- Add support for el10
+
+* Sun Sep 28 2025 Terje Rosten <terjeros@gmail.com> - 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 <terjeros@gmail.com> - 1.43.5-5
+- Add soffice patch
+- Prefer Recommends over Suggests
+
+* Tue Sep 23 2025 Terje Rosten <terjeros@gmail.com> - 1.43.5-4
+- Add more helpers
+- Add dep on kio in krunner
+
+* Mon Sep 22 2025 Terje Rosten <terjeros@gmail.com> - 1.43.5-3
+- Add helpers 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 <python-maint@redhat.com> - 1.43.5-2
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Sat Aug 30 2025 Terje Rosten <terjeros@gmail.com> - 1.43.5-1
+- 1.43.5
+
+* Tue Aug 26 2025 FeRD (Frank Dana) <ferdnyc@gmail.com> - 1.43.4-4
+- Remove QtWebKit from build requirements, no longer used
+
+* Thu Aug 21 2025 Terje Rosten <terjeros@gmail.com> - 1.43.4-3
+- Bump to qt6 and kf6
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.43.4-2
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Sun Aug 10 2025 Terje Rosten <terjeros@gmail.com> - 1.43.4-1
+- 1.43.4
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.43.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jul 05 2025 Terje Rosten <terjeros@gmail.com> - 1.43.3-1
+- 1.43.3
+
+* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 1.43.2-2
+- Rebuilt for Python 3.14
+
+* Thu May 08 2025 Terje Rosten <terjeros@gmail.com> - 1.43.2-1
+- 1.43.2
+
 * Sat Mar 29 2025 Terje Rosten <terjeros@gmail.com> - 1.43.0-1
 - 1.43.0
 

sources

@@ -1,2 +1,2 @@
-SHA512 (recoll-1.43.0.tar.gz) = 1bffe39ef6339f111604720b058b5a9f0df4de5590d9253ff4d89fdb535c17a6d75d9bf7d843ddb735fcb27b64d5c42797c6321ac40845a8eae6d2f0fec08c0f
+SHA512 (recoll-1.43.9.tar.gz) = 7dd8d70c3b51056a067f83df7ca2b46bb1663c0074b42949b9e0a9da03e4cbba3bc9182b93935f9d3b34693229841fe2162a4224bbcd0c4610d1dd550a18deb0
 SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8