From 1000387a0a2b936db65144b67b2f0bf3ba134654 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 15 Feb 2019 09:10:21 +0100
Subject: [PATCH] 1.25 packaging

---
 packaging/debian/debian/changelog    | 16 ++++++++++++----
 packaging/debian/debian/control      |  1 +
 packaging/debian/debiankio/changelog |  6 ++++++
 packaging/rpm/recoll.spec            |  4 +---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog
index ee6143d8..cb0bcf28 100644
--- a/packaging/debian/debian/changelog
+++ b/packaging/debian/debian/changelog
@@ -1,8 +1,16 @@
-recoll (1.25.0pre0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+recoll (1.25.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 
-  * Not a release: 1.25 development and testing
-    
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 13 Jun 2018 08:38:00 +0200
+  * New release 1.25.3
+  * New GUI term completion tool, fetching from search history and index
+    terms.
+  * All Python scripts converted to Python3 and using it by default.
+  * XML formats formerly using xsltproc now handled internally through
+    libxml2 and libxslt.
+  * Better support for mountable volumes: empty elements of topdirs are
+    ignored (the corresponding index data is not purged).
+  * GUI: remember and manage maximized state.
+  
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 15 Feb 2019 08:42:00 +0100
 
 recoll (1.24.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 
diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control
index ac43b548..083c1922 100644
--- a/packaging/debian/debian/control
+++ b/packaging/debian/debian/control
@@ -14,6 +14,7 @@ Build-Depends: autotools-dev,
                python-dev (>= 2.6.6-3~),
                python3-all-dev,
                qt5-qmake,
+               qt5-default,
                qtbase5-dev
 X-Python-Version: >= 3.4
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/recoll.git
diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog
index 4098024b..b2d30ffd 100644
--- a/packaging/debian/debiankio/changelog
+++ b/packaging/debian/debiankio/changelog
@@ -1,3 +1,9 @@
+kio-recoll (1.25.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * New release 1.25.3.
+    
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 15 Feb 2019 08:55:00 +0100
+
 kio-recoll (1.24.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 
   * New release 1.24.1.
diff --git a/packaging/rpm/recoll.spec b/packaging/rpm/recoll.spec
index 4a43f476..62cac294 100644
--- a/packaging/rpm/recoll.spec
+++ b/packaging/rpm/recoll.spec
@@ -3,14 +3,13 @@
 
 Summary:        Desktop full text search tool with Qt GUI
 Name:           recoll
-Version:        1.23.7
+Version:        1.25.3
 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-simpleregexp-vector-provision.patch
 BuildRequires:  aspell-devel
 BuildRequires:  bison
 BuildRequires:  desktop-file-utils
@@ -44,7 +43,6 @@ displayed in Konqueror.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p2
 
 %build
 CFLAGS="%{optflags}"; export CFLAGS