diff --git a/.gitignore b/.gitignore index 8affa42..d8044c5 100644 --- a/.gitignore +++ b/.gitignore @@ -31,72 +31,3 @@ recoll-1.13.04.tar.gz /recoll-1.23.6.tar.gz /recoll-1.23.7.tar.gz /recoll-1.24.1.tar.gz -/recoll-1.24.3.tar.gz -/recoll-1.25.4.tar.gz -/recoll-1.25.5.tar.gz -/gssp-recoll-1.0.0.tar.gz -/recoll-1.25.11.tar.gz -/recoll-1.25.15.tar.gz -/recoll-1.25.16.tar.gz -/recoll-1.25.20.tar.gz -/recoll-1.25.22.tar.gz -/recoll-1.26.0.tar.gz -/recoll-1.26.1.tar.gz -/recoll-1.26.3.tar.gz -/recoll-1.26.4.tar.gz -/recoll-1.26.5.tar.gz -/recoll-1.26.7.tar.gz -/recoll-1.27.0.tar.gz -/recoll-1.27.2.tar.gz -/recoll-1.27.3.tar.gz -/recoll-1.27.9.tar.gz -/gssp-recoll-1.1.0.tar.gz -/recoll-1.28.3.tar.gz -/recoll-1.28.5.tar.gz -/recoll-1.28.6.tar.gz -/recoll-1.29.1.tar.gz -/recoll-1.29.2.tar.gz -/recoll-1.30.0.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 -/recoll-1.31.6.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 -/recoll-1.34.0.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 -/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 -/recoll-1.43.10.tar.gz -/recoll-1.43.12.tar.gz -/recoll-1.43.13.tar.gz -/gssp-recoll-1.1.4.tar.gz -/recoll-1.43.17.tar.gz -/recoll-1.44.1.tar.gz diff --git a/0001-Convert-from-pydbus-to-Gio-to-avoid-pydbus-dependenc.patch b/0001-Convert-from-pydbus-to-Gio-to-avoid-pydbus-dependenc.patch deleted file mode 100644 index 438780b..0000000 --- a/0001-Convert-from-pydbus-to-Gio-to-avoid-pydbus-dependenc.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 47a4446270b3e7053a67999a8c7c7a2423049759 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Terje=20R=C3=B8sten?= -Date: Tue, 26 May 2026 18:36:42 +0200 -Subject: [PATCH] Convert from pydbus to Gio to avoid pydbus dependency - ---- - gssp-recoll.py | 69 ++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 55 insertions(+), 14 deletions(-) - -diff --git a/gssp-recoll.py b/gssp-recoll-1.1.4/gssp-recoll.py -index a93aaee..9f711ca 100755 ---- a/gssp-recoll.py -+++ b/gssp-recoll-1.1.4/gssp-recoll.py -@@ -24,24 +24,21 @@ import os - - from gi.repository import GLib - from gi.repository import Gio --from pydbus.generic import signal --from pydbus import SessionBus -- - - from recoll import recoll - - _defxmlfile = '/usr/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml' - _myname = 'org.recoll.Recoll.SearchProvider' -+_mypath = '/org/recoll/Recoll/SearchProvider' - - def debug(s): - print("%s"%s, file=sys.stderr) - - # debug("GSSPRecoll:recoll-search.py LOADED") - --class RecollSearchProvider(object): -+class RecollSearchProvider: - def __init__(self): -- self.results = [] -- self.proc = None -+ self.results = {} - self.db = None - try: - self.db = recoll.connect() -@@ -115,7 +112,10 @@ class RecollSearchProvider(object): - out.append(entry) - else: - debug("GSSPRecoll: GetResultMetas: %s not found" % key) -- out.append({'name':'empty', 'icon':None, 'description':'empty'}) -+ out.append({ -+ 'name': GLib.Variant('s', 'empty'), -+ 'description': GLib.Variant('s', 'empty') -+ }) - #debug("GSSPRecoll:GetResultMetas: return %s" % out) - return out - -@@ -125,8 +125,7 @@ class RecollSearchProvider(object): - doc = self.results[ident] - if doc.ipath: - debug("GSSPRecoll:ActivateResult: ipath[%s]" % doc.ipath) -- url = doc.url + "#" + doc.ipath -- proc = subprocess.Popen(["recoll", url]) -+ subprocess.Popen(["recoll", doc.url + "#" + doc.ipath]) - else: - debug("GSSPRecoll:ActivateResult: Exec xdg-open on %s" % doc.url) - os.system("xdg-open '%s'" % str(doc.url)) -@@ -136,7 +135,7 @@ class RecollSearchProvider(object): - qs = "" - for term in terms: - qs += " " + term -- proc = subprocess.Popen(["recoll", "-q", qs]) -+ subprocess.Popen(["recoll", "-q", qs]) - - def XUbuntuCancel(self): - # This interface is not documented in the SearchProvider2 document (URL above). -@@ -155,12 +154,54 @@ class RecollSearchProvider(object): - - - _defxml = open(_defxmlfile, 'r').read() --RecollSearchProvider.dbus = _defxml -+_node_info = Gio.DBusNodeInfo.new_for_xml(_defxml) -+_iface_info = _node_info.interfaces[0] -+ -+_provider = RecollSearchProvider() -+ -+def _handle_method_call(connection, sender, object_path, interface_name, -+ method_name, parameters, invocation): -+ try: -+ method = getattr(_provider, method_name) -+ args = list(parameters.unpack()) -+ result = method(*args) -+ method_info = _iface_info.lookup_method(method_name) -+ out_args = [a.signature for a in (method_info.out_args or [])] -+ if out_args: -+ ret_sig = "(" + "".join(out_args) + ")" -+ invocation.return_value(GLib.Variant(ret_sig, (result,))) -+ else: -+ invocation.return_value(None) -+ except Exception as e: -+ debug("GSSPRecoll: method call error in %s: %s" % (method_name, e)) -+ invocation.return_dbus_error('org.freedesktop.DBus.Error.Failed', str(e)) -+ -+ -+def _on_bus_acquired(connection, name): -+ connection.register_object_with_closures2( -+ _mypath, -+ _iface_info, -+ _handle_method_call, -+ None, # get_property -+ None, # set_property -+ ) -+ -+def _on_name_acquired(connection, name): -+ debug("GSSPRecoll: name acquired: %s" % name) -+ -+def _on_name_lost(connection, name): -+ debug("GSSPRecoll: name lost: %s" % name) -+ - - mainloop = GLib.MainLoop() - --session_bus = SessionBus() -- --session_bus.publish(_myname, RecollSearchProvider()) -+Gio.bus_own_name( -+ Gio.BusType.SESSION, -+ _myname, -+ Gio.BusNameOwnerFlags.NONE, -+ _on_bus_acquired, -+ _on_name_acquired, -+ _on_name_lost, -+) - - mainloop.run() --- -2.54.0 - diff --git a/qmake-qt6.sh b/qmake-qt5.sh similarity index 83% rename from qmake-qt6.sh rename to qmake-qt5.sh index 0770bcf..988d8a1 100755 --- a/qmake-qt6.sh +++ b/qmake-qt5.sh @@ -1,7 +1,7 @@ #!/bin/sh -/usr/bin/qmake6 \ - "$@" \ +/usr/bin/qmake-qt5 \ + $@ \ QMAKE_CFLAGS_RELEASE="${CFLAGS}" \ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \ QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \ diff --git a/recoll-1.42.1-cmake4.patch b/recoll-1.42.1-cmake4.patch deleted file mode 100644 index a917cd9..0000000 --- a/recoll-1.42.1-cmake4.patch +++ /dev/null @@ -1,10 +0,0 @@ -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-python.patch b/recoll-python.patch new file mode 100644 index 0000000..034fc3c --- /dev/null +++ b/recoll-python.patch @@ -0,0 +1,25 @@ +--- recoll-1.23.7/python/recoll/Makefile.in~ 2017-06-30 22:04:35.000000000 +0200 ++++ recoll-1.23.7/python/recoll/Makefile.in 2018-07-30 12:43:48.919492828 +0200 +@@ -1,9 +1,9 @@ + all: + echo libdir: $(libdir) + test '@srcdir@' = '.' || cp -rp @srcdir@/recoll . +- libdir=$(libdir) python setup.py build ++ libdir=$(libdir) python2 setup.py build + install: +- sudo python setup.py install ++ sudo python2 setup.py install + clean: + rm -rf build + rm -f recoll/__init__.pyc +--- recoll-1.23.7/Makefile.in~ 2018-01-08 14:21:44.000000000 +0100 ++++ recoll-1.23.7/Makefile.in 2018-07-30 12:58:34.781482003 +0200 +@@ -2205,7 +2205,7 @@ + @MAKEPYTHON_TRUE@ OPTSFORPYTHON=--install-layout=deb; \ + @MAKEPYTHON_TRUE@ fi; \ + @MAKEPYTHON_TRUE@ set -x; \ +-@MAKEPYTHON_TRUE@ python setup.py install \ ++@MAKEPYTHON_TRUE@ python2 setup.py install \ + @MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $${OPTSFORPYTHON}) + @MAKEPYTHON_TRUE@clean-local: recollpython-clean + @MAKEPYTHON_TRUE@recollpython-clean: diff --git a/recoll-qt.patch b/recoll-qt.patch new file mode 100644 index 0000000..1e9f906 --- /dev/null +++ b/recoll-qt.patch @@ -0,0 +1,22 @@ +diff --git a/src/qtgui/ssearch_w.cpp b/src/qtgui/ssearch_w.cpp +index 145e7c2..894eebf 100644 +--- a/src/qtgui/ssearch_w.cpp ++++ b/src/qtgui/ssearch_w.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include "log.h" + #include "guiutils.h" +@@ -709,7 +710,7 @@ bool SSearch::eventFilter(QObject *target, QEvent *event) + LOGDEB2("SSearch::eventFilter: target " << (target) << " (" << (queryText->lineEdit()) << ") type " << (eventTypeToStr(event->type())) << "\n" ); + #endif + +- if (target == queryText->view()) { ++ if (target == (QObject*)(queryText->view())) { + if (event->type() == QEvent::Hide) { + // List was closed. If we were displaying completions, need + // to reset state. + diff --git a/recoll-utf8.patch b/recoll-utf8.patch new file mode 100644 index 0000000..ad39ae2 --- /dev/null +++ b/recoll-utf8.patch @@ -0,0 +1,40 @@ +@@ -, +, @@ + GUI restable: make sure the URL column is UTF-8, else url-encode it for display +--- a/src/qtgui/restable.cpp ++++ a/src/qtgui/restable.cpp +@@ -362,19 +362,30 @@ QVariant RecollModel::data(const QModelIndex& index, int role) const + LOGDEB2("RecollModel::data: row " << index.row() << " col " << + index.column() << " role " << role << "\n"); + if (!m_source || role != Qt::DisplayRole || !index.isValid() || +- index.column() >= int(m_fields.size())) { +- return QVariant(); ++ index.column() >= int(m_fields.size())) { ++ return QVariant(); + } + + Rcl::Doc doc; + if (!m_source->getDoc(index.row(), doc)) { +- return QVariant(); ++ return QVariant(); + } + + string colname = m_fields[index.column()]; + ++ string data = m_getters[index.column()](colname, doc); ++ ++ // Special case url, because it may not be utf-8. URL-encode in this case. ++ if (!colname.compare("url")) { ++ int ecnt; ++ string data1; ++ if (!transcode(data, data1, "UTF-8", "UTF-8", &ecnt) || ecnt > 0) { ++ data = url_encode(data); ++ } ++ } ++ + list lr; +- g_hiliter.plaintorich(m_getters[index.column()](colname, doc), lr, m_hdata); ++ g_hiliter.plaintorich(data, lr, m_hdata); + return QString::fromUtf8(lr.front().c_str()); + } + + diff --git a/recoll.spec b/recoll.spec index 4afe63f..8facab3 100644 --- a/recoll.spec +++ b/recoll.spec @@ -1,134 +1,53 @@ -%global gsspver 1.1.4 -%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 +# Turn off the brp-python-bytecompile script +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.44.1 +Version: 1.24.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-qt6.sh -Patch: recoll-1.42.1-cmake4.patch -Patch: 0001-Convert-from-pydbus-to-Gio-to-avoid-pydbus-dependenc.patch +License: GPLv2+ +URL: http://www.lesbonscomptes.com/recoll/ +Source0: http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz +Source10: qmake-qt5.sh +Patch1: recoll-qt.patch +Patch2: recoll-python.patch +Patch3: recoll-utf8.patch BuildRequires: aspell-devel BuildRequires: bison -%{?chm:BuildRequires: chmlib-devel} BuildRequires: desktop-file-utils -BuildRequires: extra-cmake-modules -BuildRequires: file-devel BuildRequires: gcc-c++ # kio -%{?kio4:BuildRequires: kdelibs4-devel} -# krunner -BuildRequires: jsoncpp-devel -BuildRequires: kf6-ki18n-devel -BuildRequires: kf6-kio-devel -BuildRequires: kf6-knotifications-devel -BuildRequires: kf6-kpackage-devel -BuildRequires: kf6-krunner-devel -BuildRequires: libxslt-devel -BuildRequires: make -BuildRequires: meson -BuildRequires: python-rpm-macros +BuildRequires: kdelibs4-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtwebkit-devel +BuildRequires: extra-cmake-modules +BuildRequires: kf5-kio-devel +BuildRequires: python2-devel 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 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 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} -Supplements: (kf6-krunner and recoll) -%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} -Requires: gnome-shell -Requires: python3-gobject-base -Supplements: (gnome-shell and recoll) -%description gssp -This package contains the Recoll GNOME Shell search provider - %prep -%autosetup -p1 -D -a 1 -sed -i -e '1{\,^#!/usr/bin/env,d}' python/recoll/recoll/rclconfig.py -ln -s gssp-recoll-%{gsspver} gssp +%setup -q -n %{name}-%{version} +%patch1 -p2 +%patch2 -p1 +%patch3 -p2 %build CFLAGS="%{optflags}"; export CFLAGS @@ -136,18 +55,14 @@ 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-qt6.sh -export QMAKE=$(pwd)/qmake-qt6.sh -%meson -Drecollq=true -Dsystemd=true %{?qtweb:-Dwebengine=true} -Dwebkit=false -%meson_build +install -m755 -D %{SOURCE10} qmake-qt5.sh +export QMAKE=qmake-qt5 -# gssp -pushd gssp %configure -popd +make %{?_smp_mflags} %install -%meson_install +make install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p' desktop-file-install --delete-original \ --dir=%{buildroot}/%{_datadir}/applications \ @@ -157,438 +72,108 @@ desktop-file-install --delete-original \ rm -f %{buildroot}/usr/share/recoll/filters/xdg-open rm -f %{buildroot}%{_libdir}/recoll/librecoll.la -export RECOLL_LIB_DIR=%{_builddir}/%{name}-%{version}/redhat-linux-build/ - # kio_recoll -kde5 -pushd kde/kioslave/kio_recoll -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_kde4 -DRECOLL_PUBLIC_LIB=1 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -%cmake_build -%cmake_install -popd -%endif - -# krunner_recoll -pushd kde/krunner -cp CMakeLists-KF6.txt CMakeLists.txt -%cmake -DRECOLL_PUBLIC_LIB=1 -DQT_MAJOR_VERSION=6 -%cmake_build -%cmake_install -popd - -# gssp -pushd gssp +( +mkdir kde/kioslave/kio_recoll/build && pushd kde/kioslave/kio_recoll/build +%cmake .. +make %{?_smp_mflags} VERBOSE=1 make install DESTDIR=%{buildroot} popd +) + +# kio_recoll -kde4 +( +mkdir kde/kioslave/kio_recoll-kde4/build && \ + pushd kde/kioslave/kio_recoll-kde4/build +%cmake .. +make %{?_smp_mflags} VERBOSE=1 +make install DESTDIR=%{buildroot} +popd +) mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/recoll-%{_arch}.conf +echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/filters/ +# Mix of Python 2 and 3, needs special care -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +py2_byte_compile () { + bytecode_compilation_path="$1" + find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 %{__python2} -O -c 'import py_compile, sys; [ py_compile.compile(f, dfile=f.partition("%{buildroot}")[2]) for f in sys.argv[1:] ]' || : + find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 %{__python2} -c 'import py_compile, sys; [ py_compile.compile(f, dfile=f.partition("%{buildroot}")[2]) for f in sys.argv[1:] ]' || : +} + +py3_byte_compile () { + bytecode_compilation_path="$1" + find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 %{__python3} -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("%{buildroot}")[2], optimize=opt) for opt in range(2) for f in sys.argv[1:] ]' || : +} + +py2_byte_compile %{buildroot}%{python2_sitearch}/recoll + +for py in %{buildroot}%{_datadir}/%{name}/filters/*.py; do + if [ "$(basename $py)" = "recoll-we-move-files.py" ]; then + py3_byte_compile $py + else + py2_byte_compile $py + if [ "$(basename $py)" = "hotrecoll.py" ]; then + sed -i -e 's,#!/usr/bin/python,#!/usr/bin/python2,' $py + fi + fi +done + +%post +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi +if [ -x %{_bindir}/update-desktop-database ] ; then + %{_bindir}/update-desktop-database &> /dev/null +fi +/sbin/ldconfig +exit 0 + +%postun +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi +if [ -x %{_bindir}/update-desktop-database ] ; then + %{_bindir}/update-desktop-database &> /dev/null +fi +/sbin/ldconfig +exit 0 %files %license COPYING -%doc README -%{_sysconfdir}/ld.so.conf.d/recoll-%{_arch}.conf -%{_bindir}/recoll -%{_bindir}/recollindex -%{_bindir}/recollq -%{_datadir}/recoll -%{_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 -%{python3_sitearch}/recollaspell.cpython-*-linux-gnu*.so -%{_mandir}/man1/recoll.1* -%{_mandir}/man1/recollq.1* -%{_mandir}/man1/recollindex.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 +%doc ChangeLog README +%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf +%{_bindir}/%{name} +%{_bindir}/%{name}index +%{_datadir}/%{name} +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}-searchgui.desktop +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/pixmaps/%{name}.png +%{_libdir}/recoll +%{python2_sitearch}/recoll +%{python2_sitearch}/Recoll*.egg-info +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}q.1* +%{_mandir}/man1/%{name}index.1* +%{_mandir}/man5/%{name}.conf.5* %files kio %license COPYING -%{_libdir}/qt6/plugins/kf6/kio/kio_recoll.so -%if 0%{?kio4} %{_libdir}/kde4/kio_recoll.so +%{_libdir}/qt5/plugins/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}/qt6/plugins/kf6/krunner/krunner_recoll.so - -%files gssp -%license COPYING -%{_bindir}/gssp-recoll.py -%{_datadir}/dbus-1/services/org.recoll.Recoll.SearchProvider.service -%{_datadir}/gnome-shell/search-providers/org.recoll.Recoll.search-provider.ini +%{_datadir}/kservices5/recoll.protocol +%{_datadir}/kservices5/recollf.protocol %changelog -* Sat Aug 08 2026 Terje Rosten - 1.44.1-1 -- 1.44.1 - -* Wed Jul 22 2026 Python Maint - 1.43.17-4 -- Rebuilt for Python 3.15.0b4 ABI change - -* Thu Jul 16 2026 Fedora Release Engineering - 1.43.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Wed Jun 03 2026 Python Maint - 1.43.17-2 -- Rebuilt for Python 3.15 - -* Tue May 26 2026 Terje Rosten - 1.43.17-1 -- 1.43.17 -- Avoid pydbus dep. in gssp - -* Sun Mar 22 2026 Terje Rosten - 1.43.13-1 -- 1.43.13 - -* Sat Jan 24 2026 Terje Rosten - 1.43.12-1 -- 1.43.12 - -* Fri Jan 16 2026 Terje Rosten - 1.43.10-1 -- 1.43.10 - -* 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 - -* 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 - -* 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 -- Let -kio subpackage Supplement kf6-kio-core - -* 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 - -* Mon Sep 22 2025 Terje Rosten - 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 - 1.43.5-2 -- Rebuilt for Python 3.14.0rc3 bytecode - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 -- 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.31.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.31.0-2 -- Rebuilt for Python 3.10 - -* Wed Apr 28 2021 Terje Rosten - 1.31.0-1 -- 1.31.0 - -* Fri Apr 23 2021 Terje Rosten - 1.30.1-1 -- 1.30.1 - -* Sat Apr 03 2021 Terje Rosten - 1.30.0-1 -- 1.30.0 - -* Sun Mar 14 2021 Terje Rosten - 1.29.2-1 -- 1.29.2 - -* Thu Mar 11 2021 Terje Rosten - 1.29.1-1 -- 1.29.1 - -* Sun Feb 07 2021 Terje Rosten - 1.28.6-1 -- 1.28.6 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.28.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 20 2021 Terje Rosten - 1.28.5-1 -- 1.28.5 - -* Thu Jan 14 2021 Terje Rosten - 1.28.3-1 -- 1.28.3 - -* Mon Oct 05 2020 Terje Rosten - 1.27.9-1 -- 1.27.9 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.27.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 25 2020 Terje Rosten - 1.27.3-2 -- Fix cmake macro usage - -* Sun Jun 28 2020 Terje Rosten - 1.27.3-1 -- 1.27.3 - -* Sun Jun 07 2020 Terje Rosten - 1.27.2-1 -- 1.27.2 - -* Tue May 26 2020 Miro Hrončok - 1.27.0-3 -- Rebuilt for Python 3.9 - -* Tue May 12 2020 Terje Rosten - 1.27.0-2 -- Add patch to fix python subscriptable issue - -* Sat May 09 2020 Terje Rosten - 1.27.0-1 -- 1.27.0 - -* Mon Apr 13 2020 Terje Rosten - 1.26.7-1 -- 1.26.7 - -* Mon Mar 02 2020 Terje Rosten - 1.26.5-1 -- 1.26.5 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.26.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 23 2020 Terje Rosten - 1.26.4-1 -- 1.26.4 - -* Mon Dec 02 2019 Terje Rosten - 1.26.3-1 -- 1.26.3 - -* Sat Oct 26 2019 Terje Rosten - 1.26.1-1 -- 1.26.1 - -* Wed Oct 16 2019 Terje Rosten - 1.26.0-1 -- 1.26.0 - -* Wed Sep 04 2019 Terje Rosten - 1.25.2-1 -- 1.25.22 - -* Mon Aug 19 2019 Miro Hrončok - 1.25.20-3 -- Rebuilt for Python 3.8 - -* Mon Aug 05 2019 Terje Rosten - 1.25.20-2 -- Remove all Python 2 deps and provides - -* Mon Aug 05 2019 Terje Rosten - 1.25.20-1 -- 1.25.20 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.25.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat May 25 2019 Terje Rosten - 1.25.16-1 -- 1.25.16 - -* Sun Apr 28 2019 Terje Rosten - 1.25.15-1 -- 1.25.15 - -* Sun Mar 31 2019 Terje Rosten - 1.25.11-1 -- 1.25.11 - -* Thu Mar 14 2019 Terje Rosten - 1.25.5-2 -- Add gssp - -* Thu Mar 07 2019 Terje Rosten - 1.25.5-1 -- 1.25.5 - -* Sun Feb 24 2019 Terje Rosten - 1.25.4-1 -- 1.25.4 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.24.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Dec 03 2018 Terje Rosten - 1.24.3-1 -- 1.24.3 - * Sat Sep 29 2018 Terje Rosten - 1.24.1-1 - 1.24.1 diff --git a/sources b/sources index dbcbff3..abf95dc 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (recoll-1.44.1.tar.gz) = 6f6ee610ed215678f13d55bb7b5938c863802d5d9a4f0677a38dd5967687ca4018817f1019d647e934ecd492b1dcaba5b682fcb1cfbc8b04cc25e5afee4785c1 -SHA512 (gssp-recoll-1.1.4.tar.gz) = 33d823702633bce3fa6c60c5204cff3f991bfad8d970d74673770c7afae92f00c1e1de26458c697214aa4bfe6321cf50a1c017c271d51a63b757a253d3f77ddf +SHA512 (recoll-1.24.1.tar.gz) = 60bf57d2718a21dbd578fa1dc73a542fc7ab2152c4c5bb763885b19c14d080340587cb8c01f82f1ca7d1cb63a03edf03b4501f3ef63f06ab6506356c4a0a095c