diff --git a/.gitignore b/.gitignore index 833ddf8..c57edef 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ recoll-1.13.04.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 diff --git a/recoll-1.30.0-no-gui-dep-in-kio.patch b/recoll-1.30.0-no-gui-dep-in-kio.patch deleted file mode 100644 index 76414f3..0000000 --- a/recoll-1.30.0-no-gui-dep-in-kio.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/qtgui/guiutils.cpp -+++ b/qtgui/guiutils.cpp -@@ -30,7 +30,9 @@ - - #include - #include -+#ifdef BUILDING_RECOLLGUI - #include -+#endif - - RclDynConf *g_dynconf; - AdvSearchHist *g_advshistory; -@@ -200,9 +202,15 @@ void rwSettings(bool writing) - - SETTING_RW(prefs.reslistfontfamily, "/Recoll/prefs/reslist/fontFamily", - String, ""); -- SETTING_RW(prefs.reslistfontsize, "/Recoll/prefs/reslist/fontSize", Int, -- QFont().pointSize()); - -+ // While building the kio, we don't really care about QT Gui -+ // defaults and referencing QFont introduces a useless dependency -+#ifdef BUILDING_RECOLLGUI -+ SETTING_RW(prefs.reslistfontsize, "/Recoll/prefs/reslist/fontSize", Int, QFont().pointSize()); -+#else -+ SETTING_RW(prefs.reslistfontsize, "/Recoll/prefs/reslist/fontSize", Int, 12); -+#endif -+ - QString rlfDflt = QString::fromUtf8(prefs.dfltResListFormat); - if (writing) { - if (prefs.reslistformat.compare(rlfDflt)) { ---- a/qtgui/recoll.pro.in -+++ b/qtgui/recoll.pro.in -@@ -3,6 +3,7 @@ LANGUAGE = C++ - - VPATH = @srcdir@ - DEFINES += BUILDING_RECOLL -+DEFINES += BUILDING_RECOLLGUI - - @QMAKE_ENABLE_WEBKIT@ QT += webkit - @QMAKE_ENABLE_WEBKIT@ DEFINES += USING_WEBKIT - diff --git a/recoll.spec b/recoll.spec index 97d879f..78f4f27 100644 --- a/recoll.spec +++ b/recoll.spec @@ -2,7 +2,7 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.30.0 +Version: 1.30.1 Release: 1%{?dist} License: GPLv2+ URL: https://www.lesbonscomptes.com/recoll/ @@ -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.30.0-no-gui-dep-in-kio.patch BuildRequires: aspell-devel BuildRequires: bison BuildRequires: chmlib-devel @@ -57,9 +56,7 @@ This package contains the Recoll GNOME Shell search provider %prep %setup -q -D -a 1 -%patch01 -p1 -%patch02 -p1 -%patch03 -p1 +%autopatch -p1 sed -i -e '1{\,^#!/usr/bin/env,d}' python/recoll/recoll/rclconfig.py ln -s gssp-recoll-%{gsspver} gssp f="desktop/recoll-searchgui.desktop" @@ -167,6 +164,9 @@ echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ar %{_datadir}/applications/org.recoll.Recoll.SearchProvider.desktop %changelog +* 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 diff --git a/sources b/sources index 8403d7c..b5f012a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (recoll-1.30.0.tar.gz) = 1377e155827a587857e4cfa712a37885a48518a42d57079d8f89ed715bc00f1ee453d58fb02cf7d21ecea359f3fa4278106f5c24bd52f2833c14df8dd1863d61 +SHA512 (recoll-1.30.1.tar.gz) = 277d16c1d4fbc3b2cea111522b49241052a85ac1d233762aa65926498f400fd3ac31f17fff4ff1b4263f3130b655af3aa641c8342fdd2c65c7736f82076f50ce SHA512 (gssp-recoll-1.1.0.tar.gz) = 2b6240bc4b7e88df3feeb0d247eaec10008cbb4442d379e0c28ff1ce753273223a8dc450f8d24184bfb64200edaea7e3914d93e07816e3e415f7a5bb166c9671