spec file update for 1.25.4

packaging/rpm/recoll-25-fix-kio-build.patch

@@ -1,36 +0,0 @@
-commit 5b8e2d06e182c078b4e98e8057d3bd7a760c40b1
-Author: Jean-Francois Dockes <jf@dockes.org>
-Date:   Fri Feb 15 18:18:25 2019 +0100
-
-    Fix kio build for newer ubuntu releases and recoll 1.25
-
-diff --git a/src/kde/kioslave/kio_recoll/CMakeLists.txt b/src/kde/kioslave/kio_recoll/CMakeLists.txt
-index 0c2de973..ca10542d 100644
---- a/src/kde/kioslave/kio_recoll/CMakeLists.txt
-+++ b/src/kde/kioslave/kio_recoll/CMakeLists.txt
-@@ -42,7 +42,7 @@ set(rcltop ${CMAKE_CURRENT_SOURCE_DIR}/../../../)
- 
- # Execute recoll configuration to create autoconfig.h and version.h and
- # generate a PIC lib
--execute_process(COMMAND ${rcltop}/configure --disable-static --disable-qtgui --disable-x11mon --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
-+execute_process(COMMAND ${rcltop}/configure --disable-static --disable-qtgui --disable-x11mon --disable-python-chm --disable-python-module --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
- 		WORKING_DIRECTORY ${rcltop}
- )
- 
-@@ -80,11 +80,13 @@ add_custom_target(rcllib
- add_dependencies(kio_recoll rcllib)
- 
- target_link_libraries(kio_recoll
--recoll 
--xapian 
-+recoll
-+xapian
-+xslt
-+xml2
- KF5::KIOCore
- dl
--z 
-+z
- pthread
- )
- 

packaging/rpm/recoll-searchgui-desktop-encoding.patch

@@ -1,46 +0,0 @@
-diff --git a/packaging/rpm/recoll.spec b/packaging/rpm/recoll.spec
-index 62cac294..1a1ea621 100644
---- a/packaging/rpm/recoll.spec
-+++ b/packaging/rpm/recoll.spec
-@@ -10,6 +10,7 @@ License:        GPLv2+
- URL:            http://www.lesbonscomptes.com/recoll/
- Source0:        http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
- Source10:       qmake-qt5.sh
-+Patch0:         recoll-searchgui-desktop-encoding.patch
- BuildRequires:  aspell-devel
- BuildRequires:  bison
- BuildRequires:  desktop-file-utils
-@@ -23,6 +24,8 @@ BuildRequires:  python2-devel
- BuildRequires:  python3-devel
- BuildRequires:  xapian-core-devel
- BuildRequires:  zlib-devel
-+BuildRequires:  chmlib-devel
-+BuildRequires:  libxslt-devel
- Requires:       xdg-utils
- 
- %description
-@@ -43,6 +46,7 @@ displayed in Konqueror.
- 
- %prep
- %setup -q -n %{name}-%{version}
-+%patch0 -p2
- 
- %build
- CFLAGS="%{optflags}"; export CFLAGS
-diff --git a/src/desktop/recoll-searchgui.desktop b/src/desktop/recoll-searchgui.desktop
-index 3cceace7..bcd3ccf3 100644
---- a/src/desktop/recoll-searchgui.desktop
-+++ b/src/desktop/recoll-searchgui.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
- Categories=Qt;Utility;Filesystem;Database;
- Comment=Find documents by specifying search terms
--Comment[ru]=ðÏÉÓË ÄÏËÕÍÅÎÔÏ× ÐÏ ÚÁÄÁÎÎÙÍ ÕÓÌÏ×ÉÑÍ
-+Comment[ru]=ПоиÑ<C2B8>к документов по заданным уÑ<C692>ловиÑ<C2B8>м
- Exec=recoll
- GenericName=Local Text Search
--GenericName[ru]=ìÏËÁÌØÎÙÊ ÔÅËÓÔÏ×ÙÊ ÐÏÉÓË
-+GenericName[ru]=Локальный текÑ<C2BA>товый поиÑ<C2B8>к
- Icon=recoll
- Name=Recoll
- Terminal=false

packaging/rpm/recoll.spec

@@ -3,15 +3,13 @@
 
 Summary:        Desktop full text search tool with Qt GUI
 Name:           recoll
-Version:        1.25.3
+Version:        1.25.4
 Release:        2%{?dist}
 Group:          Applications/Databases
 License:        GPLv2+
 URL:            http://www.lesbonscomptes.com/recoll/
 Source0:        http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
 Source10:       qmake-qt5.sh
-Patch0:         recoll-searchgui-desktop-encoding.patch
-Patch1:         recoll-25-fix-kio-build.patch
 BuildRequires:  aspell-devel
 BuildRequires:  bison
 BuildRequires:  desktop-file-utils
@@ -47,8 +45,6 @@ displayed in Konqueror.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p2
-%patch1 -p2
 
 %build
 CFLAGS="%{optflags}"; export CFLAGS