Version 1.4.10

Makefile.am

@@ -2,5 +2,5 @@ SUBDIRS = src
 
 ACLOCAL_AMFLAGS = -I m4
 
-PACKAGE_VERSION = "1.4.9b"
-VERSION = "1.4.9b"
+PACKAGE_VERSION = "1.4.10"
+VERSION = "1.4.10"

PACKAGES/RPM/fts-xapian.spec.in → PACKAGES/RPM/dovecot-fts-xapian.spec.in

@@ -5,7 +5,7 @@ Summary:        Dovecot FTS plugin based on Xapian
 
 License:        LGPLv2
 URL:            https://github.com/grosjo/fts-xapian
-Source0:        %{url}/archive/refs/tags/fts-xapian-%{version}.tar.gz
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  xapian-core-devel, libicu-devel, dovecot-devel
 BuildRequires:  gcc, gcc-c++
@@ -19,7 +19,8 @@ leveraging the efforts by the Xapian.org team.
 
 This effort came after Dovecot team decided to deprecate 
 "fts_squat" included in the dovecot core, and due to the 
-complexity of the Solr plugin capabilitles, un-needed for most users.
+complexity of the Solr plugin capabilitles, un-needed for most
+users.
 
 
 %prep
@@ -39,9 +40,13 @@ rm %{buildroot}%{_libdir}/dovecot/lib21_fts_xapian_plugin.la
 
 
 %files
+%license COPYING
+%doc AUTHORS README.md
 %{_libdir}/dovecot/lib21_fts_xapian_plugin.so
 
 
 %changelog
-* Tue Apr  6 2021 xapian
+* Tue Apr  6 2021 Joan Moreau <[email protected]> - 1.4.9b-1
 - Initial RPM
+* Sat Jun 26 2021 Joan Moreau <[email protected]> - 1.4.10-1
+- cf Github

PACKAGES/RPM/rpm.sh

@@ -1,12 +1,12 @@
-VERSION=1.4.9b
+VERSION=1.4.10
 REP=`pwd`
 rpmdev-setuptree
-cat fts-xapian.spec.in | sed -e s/FTSVERSION/${VERSION}/g > fts-xapian.spec
-cp fts-xapian.spec ~/rpmbuild/SPECS/
+cat dovecot-fts-xapian.spec.in | sed -e s/FTSVERSION/${VERSION}/g > dovecot-fts-xapian.spec
+cp dovecot-fts-xapian.spec ~/rpmbuild/SPECS/
 wget https://github.com/grosjo/fts-xapian/archive/refs/tags/${VERSION}.tar.gz -O ~/rpmbuild/SOURCES/fts-xapian-${VERSION}.tar.gz
-QA_RPATHS=$(( 0x0001|0x0010 )) rpmbuild --bb --nodebuginfo ~/rpmbuild/SPECS/fts-xapian.spec
-QA_RPATHS=$(( 0x0001|0x0010 )) rpmbuild --bs --nodebuginfo ~/rpmbuild/SPECS/fts-xapian.spec
-cp ~/rpmbuild/SRPMS/dovecot-fts-xapian-${VERSION}-1.fc33.src.rpm ${REP}/
-cp ~/rpmbuild/RPMS/x86_64/dovecot-fts-xapian-${VERSION}-1.fc33.x86_64.rpm ${REP}/
-koji build --scratch f33 ./dovecot-fts-xapian-${VERSION}-1.fc33.src.rpm
+QA_RPATHS=$(( 0x0001|0x0010 )) rpmbuild --bb --nodebuginfo ~/rpmbuild/SPECS/dovecot-fts-xapian.spec
+QA_RPATHS=$(( 0x0001|0x0010 )) rpmbuild --bs --nodebuginfo ~/rpmbuild/SPECS/dovecot-fts-xapian.spec
+cp ~/rpmbuild/SRPMS/dovecot-fts-xapian-${VERSION}-1.fc34.src.rpm ${REP}/
+cp ~/rpmbuild/RPMS/x86_64/dovecot-fts-xapian-${VERSION}-1.fc34.x86_64.rpm ${REP}/
+koji build --scratch f34 ./dovecot-fts-xapian-${VERSION}-1.fc34.src.rpm
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([Dovecot FTS Xapian], [1.4.9b], [[email protected]], [dovecot-fts-xapian])
+AC_INIT([Dovecot FTS Xapian], [1.4.10], [[email protected]], [dovecot-fts-xapian])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_MACRO_DIR([m4])

fts-xapian-config.h.in

@@ -1,2 +1,2 @@
 #define FTS_XAPIAN_NAME "Dovecot FTS Xapian"
-#define FTS_XAPIAN_VERSION "1.4.9b"
+#define FTS_XAPIAN_VERSION "1.4.10"

src/fts-backend-xapian-functions.cpp

@@ -687,7 +687,7 @@ static void fts_backend_xapian_release(struct xapian_fts_backend *backend, const
 		if(verbose>0) i_info("FTS Xapian: Re-creating index database due to error");
 		try
 		{
-			Xapian::WritableDatabase * db = new Xapian::WritableDatabase(backend->db,Xapian::DB_CREATE_OR_OVERWRITE | Xapian::DB_RETRY_LOCK | Xapian::DB_BACKEND_GLASS);
+			Xapian::WritableDatabase * db = new Xapian::WritableDatabase(backend->db,Xapian::DB_CREATE_OR_OVERWRITE | Xapian::DB_RETRY_LOCK | Xapian::DB_BACKEND_GLASS | Xapian::DB_NO_SYNC);
 			db->close();
 			delete(db);
 		}