1.43.9

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

.gitignore

@@ -73,3 +73,24 @@ 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
+/recoll-1.36.1.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
+/recoll-1.40.0.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
+/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,7 +1,7 @@
 #!/bin/sh
 
-/usr/bin/qmake-qt5 \
-  $@ \
+/usr/bin/qmake6 \
+  "$@" \
   QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
   QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
   QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \

recoll-1.25.11-appdata.patch

@@ -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 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2014 Jean-Francois Dockes <jfd@recoll.org> -->
--<application>
-- <id type="desktop">recoll.desktop</id>
-+<component>
-+ <id>org.recoll.www</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <name>Recoll</name>
-@@ -17,8 +17,11 @@
-  </ul>
-  </description>
-  <screenshots>
--  <screenshot type="default">http://www.recoll.org/files/recoll-mainwin-h-1248x702.png</screenshot>
-+   <screenshot type="default">
-+     <caption>The Recoll search interface.</caption>
-+     <image type="source" width="806" height="627">https://www.lesbonscomptes.com/recoll/pics/recoll0.png</image>
-+   </screenshot>
-  </screenshots>
-  <url type="homepage">http://www.recoll.org/</url>
-- <updatecontact>contact@recoll.org</updatecontact>
--</application>
-+ <update_contact>contact@recoll.org</update_contact>
-+</component>

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)
+ 

recoll.spec

@@ -1,50 +1,106 @@
-%global         gsspver 1.1.1
+%global         gsspver 1.1.3
+%global         __cmake_in_source_build 1
+
+%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.35.0
+Version:        1.43.9
 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
+# 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-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
-BuildRequires:  kdelibs4-devel
-BuildRequires:  kf5-kio-devel
+%{?kio4:BuildRequires:  kdelibs4-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-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
 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       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
@@ -54,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.
 
@@ -63,12 +119,12 @@ 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
 
 %prep
-%setup -q -D -a 1
-%autopatch -p1
+%autosetup -p1 -D -a 1
 sed -i -e '1{\,^#!/usr/bin/env,d}' python/recoll/recoll/rclconfig.py
 ln -s gssp-recoll-%{gsspver} gssp
 
@@ -78,11 +134,10 @@ 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=qmake-qt5
-
-%configure --enable-recollq
-make %{?_smp_mflags}
+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
 pushd gssp
@@ -90,7 +145,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 \
@@ -100,26 +155,30 @@ 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
-%cmake
+cp CMakeLists-KF6.txt CMakeLists.txt
+%cmake -DRECOLL_PUBLIC_LIB=1 -DQT_MAJOR_VERSION=6
 %cmake_build
 %cmake_install
 popd
 
+%if 0%{?kio4}
 # kio_recoll -kde4
+export QMAKE=qmake-qt4
 pushd kde/kioslave/kio_recoll-kde4
-%cmake
+%cmake_kde4 -DRECOLL_PUBLIC_LIB=1 -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 %cmake_build
 %cmake_install
 popd
+%endif
 
 # krunner_recoll
 pushd kde/krunner
-%cmake
+cp CMakeLists-KF6.txt CMakeLists.txt
+%cmake -DRECOLL_PUBLIC_LIB=1 -DQT_MAJOR_VERSION=6
 %cmake_build
 %cmake_install
 popd
@@ -139,44 +198,52 @@ 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
 %{_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}/icons/hicolor/scalable/apps/recoll.svg
 %{_datadir}/pixmaps/recoll.png
-%{_libdir}/recoll
 %{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.so.*
+
+%files devel
+%{_libdir}/librecoll.so
+%{_includedir}/recoll
+
+%files helpers
+%license COPYING
+
 %files kio
 %license COPYING
+%{_libdir}/qt6/plugins/kf6/kio/kio_recoll.so
+%if 0%{?kio4}
 %{_libdir}/kde4/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
+%endif
 %{_datadir}/kio_recoll/help.html
 %{_datadir}/kio_recoll/welcome.html
 
 %files krunner
-%{_libdir}/qt5/plugins/kf5/krunner/runner_recoll.so
+%{_libdir}/qt6/plugins/kf6/krunner/krunner_recoll.so
 
 %files gssp
 %license COPYING
@@ -186,6 +253,133 @@ 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
+
+* Sat Mar 01 2025 Terje Rosten <terjeros@gmail.com> - 1.42.4-1
+- 1.42.1
+- Fix build issue with GCC 15
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.40.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Nov 16 2024 Terje Rosten <terjeros@gmail.com> - 1.40.4-1
+- 1.40.4
+
+* Tue Oct 15 2024 Terje Rosten <terjeros@gmail.com> - 1.40.3-1
+- 1.40.3
+
+* Sun Sep 15 2024 Terje Rosten <terjeros@gmail.com> - 1.40.1-1
+- 1.40.1
+
+* Wed Aug 21 2024 Terje Rosten <terjeros@gmail.com> - 1.40.0-1
+- 1.40.0
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.39.1-4
+- convert license to SPDX
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.39.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sun Jun 30 2024 Terje Rosten <terje.rosten@ntnu.no> - 1.39.1-2
+- Add patch from upstream to fix parallel build
+
+* Thu Jun 27 2024 Terje Rosten <terje.rosten@ntnu.no> - 1.39.1-1
+- 1.39.1
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 1.37.5-2
+- Rebuilt for Python 3.13
+
+* Sun May 05 2024 Terje Rosten <terje.rosten@ntnu.no> - 1.37.5-1
+- 1.37.5
+
+* Sun Feb 04 2024 Terje Rosten <terje.rosten@ntnu.no> - 1.37.4-1
+- 1.37.4
+
+* Sun Jan 28 2024 Terje Rosten <terje.rosten@ntnu.no> - 1.37.0-1
+- 1.37.0
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Nov 04 2023 Terje Rosten <terje.rosten@ntnu.no> - 1.36.1-1
+- 1.36.1
+
+* Mon Oct 30 2023 Terje Rosten <terje.rosten@ntnu.no> - 1.36.0-1
+- 1.36.0
+- Ship public lib in -libs package
+- Ship headers in -devel package
+
+* Sun Oct 15 2023 Terje Rosten <terje.rosten@ntnu.no> - 1.35.0-2
+- Add explicit buildreq on qt5-linguist
+- Use kde4 macros for kde4 parts
+
 * Thu Aug 17 2023 Terje Rosten <terje.rosten@ntnu.no> - 1.35.0-1
 - 1.35.0
 

sources

@@ -1,2 +1,2 @@
-SHA512 (recoll-1.35.0.tar.gz) = 35dcbfb650251b00f2c7654dc7617bf24f7e480955121821c55e0d31c6ec4fa041f8f99e64afa12ad4ead725c366084d7d727dbdcee875b93bbc858a6229d236
-SHA512 (gssp-recoll-1.1.1.tar.gz) = 5543ed627c1f75b6737bf1bbfc4e2bae1eaf3bb4076c3a06e2c7870eb0435c20f7c5d1d07f8c16bcdcf4dd86d994a35e734dd797c2be657e7c8450978e4f90a8
+SHA512 (recoll-1.43.9.tar.gz) = 7dd8d70c3b51056a067f83df7ca2b46bb1663c0074b42949b9e0a9da03e4cbba3bc9182b93935f9d3b34693229841fe2162a4224bbcd0c4610d1dd550a18deb0
+SHA512 (gssp-recoll-1.1.3.tar.gz) = 331b236bef42f135a67ff589fe17dcfa0a8eed0bc9b95b86f5543924be2b97f07c580dbc311717e29687801c6cb0df9921d8c58fa237ff293404752dc41f16d8