1.25 fedora packaging check

packaging/rpm/qmake-qt5.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+/usr/bin/qmake-qt5 \
+  $@ \
+  QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
+  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+  QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
+  QMAKE_STRIP=

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

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,46 @@
+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-simpleregexp-vector-provision.patch

@@ -1,13 +0,0 @@
-diff --git a/src/utils/smallut.cpp b/src/utils/smallut.cpp
-index d2218c94..48acdc9f 100644
---- a/src/utils/smallut.cpp
-+++ b/src/utils/smallut.cpp
-@@ -1281,7 +1281,7 @@ public:
-         } else {
-             ok = false;
-         }
--        matches.reserve(nmatch+1);
-+        matches.resize(nmatch+1);
-     }
-     ~Internal() {
-         regfree(&expr);

packaging/rpm/recoll.spec

@@ -10,6 +10,8 @@ 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
@@ -23,6 +25,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 +47,8 @@ displayed in Konqueror.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p2
+%patch1 -p2
 
 %build
 CFLAGS="%{optflags}"; export CFLAGS
@@ -75,16 +81,6 @@ 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/%{name}-%{_arch}.conf
 
@@ -147,18 +143,21 @@ exit 0
 %{_libdir}/recoll
 %{python_sitearch}/recoll
 %{python_sitearch}/Recoll*.egg-info
+%{python3_sitearch}/recoll
+%{python3_sitearch}/Recoll*.egg-info
+%{python_sitearch}/recollchm
+%{python_sitearch}/recollchm*.egg-info
+%{python3_sitearch}/recollchm
+%{python3_sitearch}/recollchm*.egg-info
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/%{name}q.1*
 %{_mandir}/man1/%{name}index.1*
+%{_mandir}/man1/xadump.1*
 %{_mandir}/man5/%{name}.conf.5*
 
 %files kio
 %license COPYING
-%{_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
 %{_datadir}/kio_recoll/help.html
 %{_datadir}/kio_recoll/welcome.html
 %{_datadir}/kservices5/recoll.protocol