Rebuilt for Python 3.15.0b4 ABI change

Assisted-By: Claude Opus 4.6

.gitignore

@@ -1 +1,7 @@
-xapian-bindings-*.tar.*
+/xapian-bindings-*.tar.*
+/xapian-bindings-*.src.rpm
+/xapian-bindings-*/
+clog
+.build*
+/narch/
+/tarballs/

sources

@@ -1 +1 @@
-SHA512 (xapian-bindings-1.4.13.tar.xz) = 20f5f8842e401ba1c1407f336d1a03fa8bc6faa1fcc9533bad1772644ad3ae878a51f10c2f7810f89e3f14683a73c0c089601af548cdf3fbe7feeead4d2d21d9
+SHA512 (xapian-bindings-1.4.31.tar.xz) = 0da7f503368b9976fdb155f7a2c48b6f8a44a426753cc8f0b92ea53e180faa7b0eb2f0d646c190740509af54a122f0f3df6826ff58ad77b30c4b2c7addb02298

xapian-bindings.spec

@@ -1,38 +1,25 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%{!?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.13
-Release:       1%{?dist}
+Version:       1.4.31
+Release:       4%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
-License:       GPLv2+
-URL:           http://www.xapian.org/
-Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz
+# 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
 
-# Only build py3 support on Fedora and el8
-%if 0%{?rhel} > 7 || 0%{?fedora} > 28
-%define with_py3 1
-%else
-%define with_py3 0
-%endif
-
-%if 0%{?rhel} > 7 || 0%{?fedora} > 30
-%define with_py2 1
-%else
-%define with_py2 1
-%endif
-
-BuildRequires: gcc gcc-c++
+BuildRequires: gcc-c++
 BuildRequires: libuuid-devel
-%if 0%{?with_py2}
-BuildRequires: python2-devel python2-setuptools python3-sphinx
-%endif
-%if 0%{?with_py3}
+BuildRequires: make
+BuildRequires: perl-interpreter
 BuildRequires: python3-devel python3-setuptools python3-sphinx
-%endif
 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
@@ -46,26 +33,6 @@ offers a highly adaptable toolkit that allows developers to easily add advanced
 indexing and search facilities to applications. This package provides the
 files needed for scripts which use Xapian.
 
-%if 0%{?with_py2}
-%package -n python2-xapian
-%{?python_provide:%python_provide python2-xapian}
-%{?python_provide:%python_provide python2-xapian-bindings}
-# Remove before F30
-Provides: %{name}-python = %{version}-%{release}
-Provides: %{name}-python%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-python < %{version}-%{release}
-Summary:       Files needed for developing Python scripts which use Xapian
-Requires:      %{name} = %{version}-%{release}
-%{?python_provide:%python_provide python2-xapian}
-
-%description -n python2-xapian
-Xapian is an Open Source Probabilistic Information Retrieval framework. It
-offers a highly adaptable toolkit that allows developers to easily add advanced
-indexing and search facilities to applications. This package provides the
-files needed for developing Python scripts which use Xapian.
-%endif
-
-%if 0%{?with_py3}
 %package -n python3-xapian
 Summary:       Python 3 bindings for Xapian
 Requires:      %{name} = %{version}-%{release}
@@ -76,7 +43,6 @@ Xapian is an Open Source Probabilistic Information Retrieval framework. It
 offers a highly adaptable toolkit that allows developers to easily add advanced
 indexing and search facilities to applications. This package provides the
 bindings needed for developing Python3 scripts which use Xapian.
-%endif
 
 %package ruby
 Summary:       Files needed for developing Ruby scripts which use Xapian
@@ -92,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
@@ -100,36 +67,34 @@ indexing and search facilities to applications. This package provides the
 files needed for developing TCL scripts which use Xapian
 
 %prep
-%setup -q
+%autosetup -p1
 
 # There is no sphinx.main in Sphinx 2
 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
-%if 0%{?with_py3}
 export PYTHON3_LIB=%{python3_sitelib}
-%endif
 export RUBY_LIB=%{ruby_vendorlibdir}
 export RUBY_LIB_ARCH=%{ruby_vendorarchdir}
+export TCL_LIB=%{tcl_sitearch}
 
-%configure \
-%if 0%{?with_py2}
-       %{?with_py2:--with-python} \
-%endif
-%if 0%{?with_py3}
-       %{?with_py3:--with-python3} \
-%endif
-       --with-ruby --with-tcl
+%configure --with-python3 --with-ruby --with-tcl
 
-make %{?_smp_mflags} V=1
+# 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
-make install DESTDIR=%{buildroot} INSTALL='install -p'
+%{make_install}
 
 # Remove the dev docs, we pick them up below
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
@@ -141,25 +106,149 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %license COPYING
 %doc AUTHORS NEWS README
 
-%if 0%{?with_py2}
-%files -n python2-xapian
-%doc python/docs/examples
-%{python2_sitearch}/xapian/
-%endif
-
-%if 0%{?with_py3}
 %files -n python3-xapian
 %{python3_sitelib}/xapian/
-%endif
 
 %files ruby
 %{ruby_vendorarchdir}/_xapian.so
 %{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
+
+* Tue Mar 29 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.19-1
+- Update to 1.4.19
+
+* Thu Jan 27 2022 Vít Ondruch <vondruch@redhat.com> - 1.4.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.1
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jun 26 2021 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.4.18-3
+- Rebuild with C++ 11.1
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.4.18-2
+- Rebuilt for Python 3.10
+
+* Sun Mar 07 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.18-1
+- Update to 1.4.18
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Sep 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.17-1
+- Update to 1.4.17
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.14-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.4.14-4
+- Rebuilt for Python 3.9
+
+* Mon Feb 17 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.14-3
+- Fix python3 conditioals so python3 bindings are built again
+
+* Sun Feb 16 2020 Denis Arnaud <denis.arnaud_fedora@m4x.org> 1.4.14-2
+- Dropped supprt for Python 2
+
+* Mon Feb 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.14-1
+- Update to 1.4.14
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Nov 16 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.13-2
+- Drop python2 bindings
+
 * Thu Oct 17 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.13-1
 - Update to 1.4.13