diff --git a/.gitignore b/.gitignore index 4925413..cf421b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ -xapian-bindings-*.tar.* +/xapian-bindings-*.tar.* +/xapian-bindings-*.src.rpm +/xapian-bindings-*/ +clog +.build* +/narch/ +/tarballs/ diff --git a/sources b/sources index fc5f4cd..afee0ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-bindings-1.4.13.tar.xz) = 20f5f8842e401ba1c1407f336d1a03fa8bc6faa1fcc9533bad1772644ad3ae878a51f10c2f7810f89e3f14683a73c0c089601af548cdf3fbe7feeead4d2d21d9 +SHA512 (xapian-bindings-1.4.14.tar.xz) = 6d35c6c011c6d841254934f4dd59f4a2b842fe826af108e526cde9acbccec67b43517974331b21cbee5e828d0743aa5b9b973a96e1940065fbcfc342b8f23ead diff --git a/xapian-bindings-01-swig-ruby-27.patch b/xapian-bindings-01-swig-ruby-27.patch new file mode 100644 index 0000000..3aad1b4 --- /dev/null +++ b/xapian-bindings-01-swig-ruby-27.patch @@ -0,0 +1,12 @@ +diff -Naur xapian-bindings-1.4.14.orig/ruby/xapian_wrap.cc xapian-bindings-1.4.14/ruby/xapian_wrap.cc +--- xapian-bindings-1.4.14.orig/ruby/xapian_wrap.cc 2019-11-23 08:18:02.000000000 +0100 ++++ xapian-bindings-1.4.14/ruby/xapian_wrap.cc 2020-02-16 22:52:01.756905175 +0100 +@@ -1283,7 +1283,7 @@ + swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value); + } + +- rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", swig_ruby_trackings_count, NULL); ++ rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", (rb_gvar_getter_t*) swig_ruby_trackings_count, (rb_gvar_setter_t*) NULL); + } + + /* Add a Tracking from a C/C++ struct to a Ruby object */ diff --git a/xapian-bindings.spec b/xapian-bindings.spec index 1fbe6d8..8aff085 100644 --- a/xapian-bindings.spec +++ b/xapian-bindings.spec @@ -1,34 +1,28 @@ -%{!?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}} Name: xapian-bindings -Version: 1.4.13 +Version: 1.4.14 Release: 1%{?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 +# BZ#1800264 +# Hint for a fix: https://github.com/swig/swig/issues/1689 +#Patch0: xapian-bindings-01-swig-ruby-27.patch -# Only build py3 support on Fedora and el8 -%if 0%{?rhel} > 7 || 0%{?fedora} > 28 -%define with_py3 1 -%else + +# Only build py3 support on Fedora and EPEL +%if 0%{?rhel} <= 6 %define with_py3 0 -%endif - -%if 0%{?rhel} > 7 || 0%{?fedora} > 30 -%define with_py2 1 %else -%define with_py2 1 +%define with_py3 1 %endif BuildRequires: gcc gcc-c++ BuildRequires: libuuid-devel -%if 0%{?with_py2} -BuildRequires: python2-devel python2-setuptools python3-sphinx -%endif %if 0%{?with_py3} BuildRequires: python3-devel python3-setuptools python3-sphinx %endif @@ -46,25 +40,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 @@ -100,7 +75,7 @@ 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) @@ -118,18 +93,15 @@ export RUBY_LIB=%{ruby_vendorlibdir} export RUBY_LIB_ARCH=%{ruby_vendorarchdir} %configure \ -%if 0%{?with_py2} - %{?with_py2:--with-python} \ -%endif %if 0%{?with_py3} %{?with_py3:--with-python3} \ %endif --with-ruby --with-tcl -make %{?_smp_mflags} V=1 +%{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,12 +113,6 @@ 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/ @@ -160,308 +126,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_libdir}/tcl%{tcl_version}/xapian%{version}/ %changelog -* Thu Oct 17 2019 Peter Robinson 1.4.13-1 -- Update to 1.4.13 - -* Thu Oct 03 2019 Miro Hrončok - 1.4.12-3 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Wed Aug 21 2019 Miro Hrončok - 1.4.12-2 -- Rebuilt for Python 3.8 - -* Tue Aug 20 2019 Peter Robinson 1.4.12-1 -- Update to 1.4.12 - -* Mon Aug 19 2019 Miro Hrončok - 1.4.11-3 -- Rebuilt for Python 3.8 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.4.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Apr 16 2019 Peter Robinson 1.4.11-1 -- Update to 1.4.11 - -* Mon Feb 11 2019 Peter Robinson 1.4.10-1 -- Update to 1.4.10 - -* Sun Feb 03 2019 Fedora Release Engineering - 1.4.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Nov 19 2018 Peter Robinson 1.4.9-1 -- Update to 1.4.9 - -* Tue Aug 14 2018 Peter Robinson 1.4.7-1 -- Update to 1.4.7 - -* Sat Jul 14 2018 Fedora Release Engineering - 1.4.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jul 10 2018 Peter Robinson 1.4.6-2 -- Re-enable py2 support on rawhide - -* Tue Jul 3 2018 Peter Robinson 1.4.6-1 -- Update to 1.4.6 -- Add py2/py3 conditionals, build just py3 on F-29+, py2/py3 on older Fedora - -* Thu Jun 14 2018 Miro Hrončok - 1.4.5-5 -- Rebuilt for Python 3.7 - -* Fri Mar 9 2018 Peter Robinson 1.4.5-4 -- Add gcc BR - -* Fri Feb 09 2018 Fedora Release Engineering - 1.4.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Feb 05 2018 Iryna Shcherbina - 1.4.5-2 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Mon Jan 29 2018 Peter Robinson 1.4.5-1 -- Update to 1.4.5 - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.4.4-6 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.4.4-5 -- Python 2 binary package renamed to python2-xapian-bindings - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Aug 03 2017 Fedora Release Engineering - 1.4.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 07 2017 Igor Gnatenko - 1.4.4-2 -- Rebuild due to bug in RPM (RHBZ #1468476) - -* Tue May 16 2017 Peter Robinson 1.4.4-1 -- Update to 1.4.4 - -* Sat Feb 11 2017 Fedora Release Engineering - 1.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Feb 4 2017 Peter Robinson 1.4.3-1 -- Update to 1.4.3 - -* Sat Jan 14 2017 Vít Ondruch - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4 - -* Thu Dec 22 2016 Peter Robinson 1.4.1-1 -- Update to 1.4.1 -- Enable python3 bindings (rhbz #1282057) - -* Tue Jul 19 2016 Fedora Release Engineering - 1.2.23-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue Jul 5 2016 Peter Robinson 1.2.23-1 -- Update to 1.2.23 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.2.22-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 14 2016 Vít Ondruch - 1.2.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3 - -* Wed Jan 6 2016 Peter Robinson 1.2.22-1 -- Update to 1.2.22 -- Use %%license - -* Fri Jun 19 2015 Fedora Release Engineering - 1.2.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Jun 15 2015 Peter Robinson 1.2.21-1 -- Update to 1.2.21 - -* Sat May 02 2015 Kalev Lember - 1.2.20-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Sat Mar 21 2015 Peter Robinson 1.2.20-1 -- Update to 1.2.20 - -* Tue Jan 20 2015 Vít Ondruch - 1.2.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.2 - -* Tue Nov 11 2014 Peter Robinson 1.2.19-1 -- Update to 1.2.19 - -* Mon Sep 1 2014 Peter Robinson 1.2.18-2 -- Set tcl version as macro rather than static - -* Mon Sep 1 2014 Peter Robinson 1.2.18-1 -- Update to 1.2.18 - -* Wed Aug 20 2014 Kevin Fenzi - 1.2.17-5 -- Rebuild for rpm bug 1131892 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.2.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.2.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Apr 29 2014 Vít Ondruch - 1.2.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 - -* Sat Feb 15 2014 Peter Robinson 1.2.17-1 -- Update to 1.2.17 - -* Sun Jan 12 2014 Peter Robinson 1.2.16-1 -- Update to 1.2.16 - -* Fri Aug 23 2013 Peter Robinson 1.2.15-1 -- Update to 1.2.15 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Mar 23 2013 Peter Robinson 1.2.14-1 -- Update to 1.2.14 - -* Fri Feb 15 2013 Fedora Release Engineering - 1.2.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.2.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jul 4 2012 Peter Robinson - 1.2.12-1 -- Update to 1.2.12 -- Drop php bindings due to license issue RHBZ #836112 - -* Sun Apr 29 2012 Peter Robinson - 1.2.9-1 -- Update to 1.2.9 - -* Wed Feb 08 2012 Bohuslav Kabrda - 1.2.8-3 -- Rebuilt for Ruby 1.9.3. - -* Sun Jan 22 2012 Remi Collet - 1.2.8-2 -- build against PHP 5.4 -- fix php ABI check -- extension not loadable, must be fixed -- add filter for private-shared-object-provides - -* Sat Jan 21 2012 Peter Robinson - 1.2.8-1 -- Update to 1.2.8 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.2.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Aug 18 2011 Peter Robinson - 1.2.7-1 -- Update to 1.2.7 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jan 16 2011 Peter Robinson 1.2.4-1 -- Update to new 1.2.4 release -- enable tcl and php bindings - -* Mon Aug 30 2010 Peter Robinson 1.2.3-1 -- Update to new stable 1.2.3 release - -* Sun Aug 1 2010 Peter Robinson 1.2.2-3 -- Bump build - -* Fri Jul 23 2010 Peter Robinson 1.2.2-2 -- Bump build - -* Fri Jul 23 2010 Peter Robinson 1.2.2-1 -- Update to new stable 1.2.2 release - -* Thu Jul 22 2010 David Malcolm - 1.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Fri May 7 2010 Peter Robinson 1.2.0-2 -- Add new dependencies - -* Fri May 7 2010 Peter Robinson 1.2.0-1 -- Update to new stable 1.2.0 release - -* Sun Mar 21 2010 Peter Robinson 1.0.18-1 -- Update to 1.0.18 - -* Sat Jan 9 2010 Peter Robinson 1.0.17-3 -- Updated to the new python sysarch spec file reqs - -* Wed Dec 2 2009 Peter Robinson 1.0.17-2 -- Drop upstreamed patch - -* Wed Dec 2 2009 Peter Robinson 1.0.17-1 -- Update to 1.0.17 - -* Sat Sep 19 2009 Peter Robinson 1.0.16-1 -- Update to 1.0.16, some spec file cleanups - -* Sun Sep 6 2009 Peter Robinson 1.0.15-2 -- Patch to fix python bindings build - -* Thu Aug 27 2009 Peter Robinson 1.0.15-1 -- Update to 1.0.15 - -* Wed Jul 29 2009 Peter Robinson 1.0.14-1 -- Update to 1.0.14 - -* Mon Jul 27 2009 Fedora Release Engineering - 1.0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Jun 5 2009 Peter Robinson 1.0.13-1 -- Update to 1.0.13 - -* Sun Apr 19 2009 Peter Robinson 1.0.12-1 -- Update to 1.0.12 - -* Tue Apr 07 2009 Peter Robinson 1.0.11-2 -- Obsolete pyxapian - -* Mon Apr 06 2009 Peter Robinson 1.0.11-1 -- Update to 1.0.11 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.0.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Nov 30 2008 Ignacio Vazquez-Abrams 1.0.9-2 -- Rebuild for Python 2.6 - -* Sat Nov 29 2008 Adel Gadllah 1.0.9-1 -- Update to 1.0.9 - -* Sat Oct 11 2008 Adel Gadllah 1.0.8-1 -- Update to 1.0.8 - -* Mon Jul 28 2008 Adel Gadllah 1.0.7-2 -- Enable ruby bindings RH #456951, patch by Scott Seago - -* Sun Jul 20 2008 Adel Gadllah 1.0.7-1 -- Update to 1.0.7 - -* Sun Mar 30 2008 Adel Gadllah 1.0.6-1 -- Update to 1.0.6 - -* Sat Feb 09 2008 Adel Gadllah 1.0.5-2 -- Rebuild for gcc-4.3 - -* Thu Dec 27 2007 Adel Gadllah 1.0.5-1 -- Update to 1.0.5 - -* Tue Oct 30 2007 Adel Gadllah 1.0.4-1 -- Update to 1.0.4 - -* Thu Aug 16 2007 Adel Gadllah 1.0.2-4 -- License is GPLv2+ not GPLv2 - -* Sun Aug 12 2007 Adel Gadllah 1.0.2-3 -- Remove vendor tag RH #251832 - -* Wed Aug 08 2007 Adel Gadllah 1.0.2-2 -- Fix license tag -- Minor cleanups -- Add disttag - -* Fri Jul 13 2007 Marco Pesenti Gritti - 1.0.2-1 -- Update to 1.0.2 - -* Tue Jun 19 2007 Marco Pesenti Gritti 1.0.1-2 -- Remove req on xapian-bindings +* Sun Feb 16 2020 Denis Arnaud 1.4.14-1 +- Update to 1.4.14 * Mon Jun 18 2007 Marco Pesenti Gritti 1.0.1-1 - Initial build +