Rebuilt for Python 3.15.0b4 ABI change

Assisted-By: Claude Opus 4.6

sources

@@ -1 +1 @@
-SHA512 (xapian-bindings-1.4.19.tar.xz) = c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
+SHA512 (xapian-bindings-1.4.31.tar.xz) = 0da7f503368b9976fdb155f7a2c48b6f8a44a426753cc8f0b92ea53e180faa7b0eb2f0d646c190740509af54a122f0f3df6826ff58ad77b30c4b2c7addb02298

xapian-bindings.spec

@@ -1,20 +1,25 @@
-%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
-%{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+%global tcl_version 8.6
+%global tcl_sitearch %{_libdir}/tcl%{tcl_version}
 
 Name:          xapian-bindings
-Version:       1.4.19
-Release:       2%{?dist}
+Version:       1.4.31
+Release:       4%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
-License:       GPLv2+
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:       GPL-2.0-or-later
 URL:           https://www.xapian.org/
 Source0:       https://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz
 
 BuildRequires: gcc-c++
 BuildRequires: libuuid-devel
 BuildRequires: make
+BuildRequires: perl-interpreter
 BuildRequires: python3-devel python3-setuptools python3-sphinx
 BuildRequires: ruby ruby-devel rubygems rubygem-rdoc rubygem-json
+# swig 4.4.0+ contains a fix for PyThread_release_lock/PyThread_free_lock in Mutex destructor
+# needed for successful build with Python 3.15
+BuildRequires: swig >= 4.4.0
 BuildRequires: tcl-devel
 BuildRequires: xapian-core-devel
 BuildRequires: zlib-devel
@@ -53,6 +58,7 @@ files needed for developing Ruby scripts which use Xapian
 %package -n tcl-xapian
 Summary:       Files needed for developing TCL scripts which use Xapian
 Requires:      %{name} = %{version}-%{release}
+Requires:      tcl >= %{tcl_version}
 
 %description -n tcl-xapian
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -67,17 +73,24 @@ files needed for developing TCL scripts which use Xapian
 sed -i 's/sphinx\.main/sphinx.cmd.build.main/g' $(grep -r 'sphinx\.main' -l)
 sed -i 's/import sphinx/import sphinx.cmd.build/g' $(grep -r 'import sphinx' -l)
 
-# Trick Python 2 to build docs by Python 3
-sed -i 's/$PYTHON2 -c '"'"'import sphinx/python3 -c '"'"'import sphinx/' configure configure.ac
-sed -i 's/PYTHONPATH=..:$$PYTHONPATH $(OSX_SIP_HACK_ENV) $(PYTHON2)/PYTHONPATH=..:$$PYTHONPATH $(OSX_SIP_HACK_ENV) python3/' python/Makefile.am python/Makefile.in
-
 %build
 export PYTHON3_LIB=%{python3_sitelib}
 export RUBY_LIB=%{ruby_vendorlibdir}
 export RUBY_LIB_ARCH=%{ruby_vendorarchdir}
+export TCL_LIB=%{tcl_sitearch}
 
 %configure --with-python3 --with-ruby --with-tcl
 
+# Regenerate Python's SWIG wrapper with system swig
+pushd python3
+swig -DSWIG_PYTHON_LEGACY_BOOL \
+     $(xapian-config --swigflags) \
+     -I. -c++ -python -threads -shadow -O \
+     -o xapian_wrap.cc python.i
+perl fixup-swig-py3-wrapper xapian.py > xapian__init__.py
+rm xapian.py
+popd
+
 %{make_build}
 
 %install
@@ -101,9 +114,90 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{ruby_vendorlibdir}/xapian.rb
 
 %files -n tcl-xapian
-%{_libdir}/tcl%{tcl_version}/xapian%{version}/
+%{tcl_sitearch}/xapian%{version}/
 
 %changelog
+* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 1.4.31-4
+- Rebuilt for Python 3.15.0b4 ABI change
+
+* Fri Jul 03 2026 Karolina Surma <ksurma@redhat.com> - 1.4.31-3
+- Regenerate SWIG wrapper at build time with swig >= 4.4.0 (rhbz#2417021)
+
+* Wed Feb 25 2026 Christiano Anderson <chris@christiano.me> - 1.4.31-2
+- Rebuild to 1.4.31
+
+* Tue Feb 24 2026 Christiano Anderson <chris@christiano.me> - 1.4.31-1
+- Update to 1.4.31
+
+* Mon Jan 19 2026 Christiano Anderson <chris@christiano.me> - 1.4.30-1
+- Update to 1.4.30
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.29-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.4.29-5
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.4.29-4
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.29-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 1.4.29-2
+- Rebuilt for Python 3.14
+
+* Thu May 01 2025 Christiano Anderson <chris@christiano.dev> - 1.4.29-1
+- Update to 1.4.29
+
+* Sun Mar 30 2025 Christiano Anderson <chris@christiano.dev> - 1.4.27-1
+- Update to 1.4.27
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.26-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jan 08 2025 Vít Ondruch <vondruch@redhat.com> - 1.4.26-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.4
+
+* Sun Aug 18 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.26-2
+- TCL bindings should require TCL
+
+* Fri Aug 16 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.26-1
+- Update to 1.4.26
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.4.23-5
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.23-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 1.4.23-3
+- Rebuilt for Python 3.13
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jul 25 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.23-1
+- Update 1.4.23
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.22-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 1.4.22-2
+- Rebuilt for Python 3.12
+
+* Thu May 18 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.22-1
+- Update to 1.4.22
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Aug 02 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.20-1
+- Update to 1.4.20
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.19-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.4.19-2
 - Rebuilt for Python 3.11