From 12cee80b550dccfd789a2a0119ec362d3dbc6043 Mon Sep 17 00:00:00 2001
From: Automatic Build System <autodist@openmamba.org>
Date: Fri, 12 Jul 2024 11:21:46 +0200
Subject: [PATCH] automatic version update by autodist [release
 1.39.1-1mamba;Thu Jul 11 2024]

---
 recoll-1.9.0-security_mktemp.patch | 48 ------------------------------
 recoll.spec                        | 37 ++++++++++-------------
 2 files changed, 15 insertions(+), 70 deletions(-)
 delete mode 100644 recoll-1.9.0-security_mktemp.patch

diff --git a/recoll-1.9.0-security_mktemp.patch b/recoll-1.9.0-security_mktemp.patch
deleted file mode 100644
index 6411c3c..0000000
--- a/recoll-1.9.0-security_mktemp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur -F'^f' recoll-1.9.0/filters.orig/rcllyx recoll-1.9.0/filters/rcllyx
---- recoll-1.9.0/filters.orig/rcllyx	2007-02-06 16:08:22.000000000 +0100
-+++ recoll-1.9.0/filters/rcllyx	2007-04-25 19:00:12.000000000 +0200
-@@ -107,8 +107,10 @@ fi
-    ttdir=/tmp
- fi
- 
--tmpdir=$ttdir/rcllyx_tmp$$
--mkdir $tmpdir || exit 1
-+tmpdir=`mktemp -d $ttdir/rcllyx.XXXXXX` ||
-+   { echo "Cannot create directory \`$tmpdir'. Aborting." >&2; exit 1; }
-+trap 'ret=$?; rm -rf $tmpdir && exit $ret' 0
-+trap '(exit 0); exit' 1 2 13 15
- mkdir $tmpdir/rcllyxtmp || exit 1
- 
- cleanup()
-diff -ur -F'^f' recoll-1.9.0/filters.orig/rclsoff recoll-1.9.0/filters/rclsoff
---- recoll-1.9.0/filters.orig/rclsoff	2007-02-06 16:08:23.000000000 +0100
-+++ recoll-1.9.0/filters/rclsoff	2007-04-25 18:55:17.000000000 +0200
-@@ -100,8 +100,10 @@ fi
- else
-    ttdir=/tmp
- fi
--tmpdir=$ttdir/rclsoff_tmp$$
--mkdir $tmpdir || exit 1
-+tmpdir=`mktemp -d $ttdir/rclsoff.XXXXXX` ||
-+   { echo "Cannot create directory \`$tmpdir'. Aborting." >&2; exit 1; }
-+trap 'ret=$?; rm -rf $tmpdir && exit $ret' 0
-+trap '(exit 0); exit' 1 2 13 15
- mkdir $tmpdir/rclsofftmp || exit 1
- 
- cleanup()
-diff -ur -F'^f' recoll-1.9.0/filters.orig/rclkwd recoll-1.9.0/filters/rclkwd
---- recoll-1.9.0/filters.orig/rclkwd	2007-02-06 16:08:22.000000000 +0100
-+++ recoll-1.9.0/filters/rclkwd	2007-04-25 19:00:12.000000000 +0200
-@@ -102,8 +102,10 @@ fi
- else
-    ttdir=/tmp
- fi
--tmpdir=$ttdir/rclkwd_tmp$$
--mkdir $tmpdir || exit 1
-+tmpdir=`mktemp -d $ttdir/rclkwd.XXXXXX` ||
-+   { echo "Cannot create directory \`$tmpdir'. Aborting." >&2; exit 1; }
-+trap 'ret=$?; rm -rf $tmpdir && exit $ret' 0
-+trap '(exit 0); exit' 1 2 13 15
- mkdir $tmpdir/rclkwdtmp || exit 1
- 
- cleanup()
diff --git a/recoll.spec b/recoll.spec
index cecc2ea..4174964 100644
--- a/recoll.spec
+++ b/recoll.spec
@@ -1,6 +1,6 @@
 Name:          recoll
 Epoch:         1
-Version:       1.37.5
+Version:       1.39.1
 Release:       1mamba
 Summary:       A personal full text search tool for Unix/Linux
 Group:         Graphical Desktop/Applications/Databases
@@ -9,7 +9,6 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.recoll.org//
 Source:        http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
-Patch:         %{name}-1.9.0-security_mktemp.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -19,6 +18,7 @@ BuildRequires: libaspell-devel
 BuildRequires: libchm-devel
 BuildRequires: libgcc
 BuildRequires: libglvnd-devel
+BuildRequires: libmagic-devel
 BuildRequires: libpython311-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libxapian-devel
@@ -71,19 +71,15 @@ This package provides the Python bindings.
 
 %prep
 %setup -q
-#% patch -p1
-#rm -f filters/*~
 
 %build
-%configure
-%make
+%meson
+
+%meson_build
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall
-
-# Remove python2 bindings
-[ -e %{buildroot}%{python27_sitearch} ] && rm -rf %{buildroot}%{python27_sitearch}/*
+%meson_install
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -91,11 +87,12 @@ This package provides the Python bindings.
 %files
 %defattr(-,root,root)
 %{_bindir}/%{name}*
+%{_datadir}/applications/%{name}*.desktop
+%{_metainfodir}/org.recoll.recoll.appdata.xml
 %{_unitdir}/recollindex@.service
 %{_userunitdir}/recollindex.service
-%{_datadir}/%{name}
-%{_datadir}/metainfo/recoll.appdata.xml
-%{_datadir}/applications/%{name}*.desktop
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %{_datadir}/icons/hicolor/*/apps/%{name}*.png
 %{_datadir}/pixmaps/recoll.png
 %{_mandir}/man1/*
@@ -103,32 +100,28 @@ This package provides the Python bindings.
 
 %files -n lib%{name}
 %defattr(-,root,root)
-%{_libdir}/librecoll-*.so
-%{_libdir}/librecoll.so
+%{_libdir}/librecoll.so.*
 %doc COPYING
 
 %files -n lib%{name}-devel
 %defattr(-,root,root)
 %dir %{_includedir}/recoll
 %{_includedir}/recoll/*
+%{_libdir}/librecoll.so
 
 %files -n python-recoll
 %defattr(-,root,root)
-#%{python27_sitearch}/Recoll-*-py*.egg-info
-#%dir %{python27_sitearch}/recoll
-#%{python27_sitearch}/recoll/*
-%dir %{python3_sitearch}/recoll_aspell_python_*.egg-info
-%{python3_sitearch}/recoll_aspell_python_*.egg-info/*
 %{python3_sitearch}/recollaspell.cpython-*.so
 %dir %{python3_sitearch}/recoll
 %{python3_sitearch}/recoll/*
 %dir %{python3_sitearch}/recollchm
 %{python3_sitearch}/recollchm/*
-%{python3_sitearch}/recollchm-*
-%{python3_sitearch}/Recoll-*
 #%doc ChangeLog README
 
 %changelog
+* Thu Jul 11 2024 Automatic Build System <autodist@openmamba.org> 1.39.1-1mamba
+- automatic version update by autodist
+
 * Sun Apr 28 2024 Automatic Build System <autodist@openmamba.org> 1.37.5-1mamba
 - automatic version update by autodist