Hello community, here is the log from the commit of package xapian-bindings for openSUSE:Factory checked in at 2017-03-12 20:00:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xapian-bindings (Old) and /work/SRC/openSUSE:Factory/.xapian-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xapian-bindings" Sun Mar 12 20:00:01 2017 rev:23 rq:468645 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xapian-bindings/xapian-bindings.changes 2016-12-05 16:34:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xapian-bindings.new/xapian-bindings.changes 2017-03-12 20:00:03.063283468 +0100 @@ -1,0 +2,19 @@ +Wed Feb 1 09:48:05 UTC 2017 - [email protected] + +- Update to 1.4.3 + * see http://xapian.org/docs/xapian-bindings-1.4.3/NEWS +- xapian-bindings 1.4.3 requires Python >= 2.6 +- Update to 1.4.2 + * see http://xapian.org/docs/xapian-bindings-1.4.2/NEWS +- Added BuildRequire python3-Sphinx +- Drop automake.patch, which is not needed anymore +- Added do-not-use-sphinx.diff to remove the need of python3-Sphinx + on distributions that don't have it + +------------------------------------------------------------------- +Tue Nov 22 13:15:37 UTC 2016 - [email protected] + +- Python3 support +- Added automake patch for building with python3 (github PR 126) + +------------------------------------------------------------------- Old: ---- xapian-bindings-1.4.1.tar.xz xapian-bindings-1.4.1.tar.xz.asc New: ---- do-not-use-sphinx.diff xapian-bindings-1.4.3.tar.xz xapian-bindings-1.4.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xapian-bindings.spec ++++++ --- /var/tmp/diff_new_pack.Jrivud/_old 2017-03-12 20:00:04.139131238 +0100 +++ /var/tmp/diff_new_pack.Jrivud/_new 2017-03-12 20:00:04.143130672 +0100 @@ -1,7 +1,7 @@ # # spec file for package xapian-bindings # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,14 @@ %define php_extension_dir %(php-config --extension-dir) %bcond_with mono +%if 0%{?suse_version} >= 1320 && 0%{?is_opensuse} +%bcond_without sphinx +%else +%bcond_with sphinx +%endif + Name: xapian-bindings -Version: 1.4.1 +Version: 1.4.3 Release: 0 Summary: Bindings for xapian License: GPL-2.0 @@ -29,6 +35,7 @@ Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz Source1: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring +Patch0: do-not-use-sphinx.diff BuildRequires: java-devel BuildRequires: libuuid-devel BuildRequires: libxapian-devel = %{version} @@ -37,8 +44,14 @@ %endif BuildRequires: php5-devel >= 5.5 BuildRequires: pkg-config -BuildRequires: python-devel +BuildRequires: python-devel >= 2.6 +BuildRequires: python-setuptools +%if %{with sphinx} BuildRequires: python-sphinx +BuildRequires: python3-Sphinx +%endif +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: ruby-devel BuildRequires: tcl-devel BuildRequires: xz @@ -52,7 +65,6 @@ %package -n python-xapian Summary: Files needed for developing Python scripts which use Xapian Group: Development/Libraries/Python -%py_requires %description -n python-xapian Xapian is an Open Source Probabilistic Information Retrieval framework. It @@ -60,6 +72,16 @@ indexing and search facilities to applications. This package provides the files needed for developing Python scripts which use Xapian. +%package -n python3-xapian +Summary: Files needed for developing Python scripts which use Xapian +Group: Development/Libraries/Python + +%description -n python3-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. + %package -n php-xapian Summary: Files needed for developing PHP scripts which use Xapian Group: Productivity/Networking/Web/Servers @@ -108,10 +130,17 @@ %prep %setup -q +%if %{without sphinx} +%patch0 -p1 +%endif %build + +autoreconf -vfi + %configure \ --with-python \ + --with-python3 \ --with-php \ --with-ruby \ --with-tcl \ @@ -134,7 +163,14 @@ %doc AUTHORS COPYING ChangeLog HACKING NEWS README TODO %dir %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}/python/ -%{py_sitedir}/xapian/ +%{python_sitearch}/xapian/ + +%files -n python3-xapian +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog HACKING NEWS README TODO +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/python3/ +%{python3_sitearch}/xapian/ %files -n php-xapian %defattr(-,root,root) ++++++ do-not-use-sphinx.diff ++++++ Index: xapian-bindings-1.4.3/python/Makefile.am =================================================================== --- xapian-bindings-1.4.3.orig/python/Makefile.am +++ xapian-bindings-1.4.3/python/Makefile.am @@ -158,9 +158,7 @@ sphinxdocs = docs/html/index.html install-data-local: $(mkinstalldirs) '$(DESTDIR)$(docdir)/python' - cp -R -p `test -r docs/html || echo '$(srcdir)/'`docs/html '$(DESTDIR)$(docdir)/python' - -all-local: $(sphinxdocs) + cp -R -p `test -r docs/index.rst || echo '$(srcdir)/'`docs '$(DESTDIR)$(docdir)/python' $(sphinxdocs): xapian/__init__.py xapian/_xapian$(PYTHON2_SO) docs/conf.py $(RST_DOCS) $(dist_exampledata_DATA) ## We need to run Sphinx for the right version of Python here, so we can't Index: xapian-bindings-1.4.3/python3/Makefile.am =================================================================== --- xapian-bindings-1.4.3.orig/python3/Makefile.am +++ xapian-bindings-1.4.3/python3/Makefile.am @@ -163,9 +163,7 @@ sphinxdocs = docs/html/index.html install-data-local: $(mkinstalldirs) '$(DESTDIR)$(docdir)/python3' - cp -R -p `test -r docs/html || echo '$(srcdir)/'`docs/html '$(DESTDIR)$(docdir)/python3' - -all-local: $(sphinxdocs) + cp -R -p `test -r docs/index.rst || echo '$(srcdir)/'`docs '$(DESTDIR)$(docdir)/python3' $(sphinxdocs): xapian/__init__.py xapian/_xapian$(PYTHON3_SO) docs/conf.py $(RST_DOCS) $(dist_exampledata_DATA) ## We need to run Sphinx for the right version of Python here, so we can't Index: xapian-bindings-1.4.3/configure =================================================================== --- xapian-bindings-1.4.3.orig/configure +++ xapian-bindings-1.4.3/configure @@ -17097,19 +17097,6 @@ $as_echo "$as_me: WARNING: Couldn't impo fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python2 sphinx module" >&5 -$as_echo_n "checking for python2 sphinx module... " >&6; } - if $PYTHON2 -c 'import sphinx;print(repr(sphinx.main))' >&5 2>&5 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - if test yes = "$with_python2" ; then - as_fn_error $? "Couldn't import sphinx module and call sphinx.main() for Python2 - try package python-sphinx" "$LINENO" 5 - fi - PYTHON2= - fi if test -n "$PYTHON2" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PYTHON2_INC/Python.h" >&5 $as_echo_n "checking for $PYTHON2_INC/Python.h... " >&6; } @@ -17284,19 +17271,6 @@ $as_echo "$as_me: WARNING: Couldn't impo fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python3 sphinx module" >&5 -$as_echo_n "checking for python3 sphinx module... " >&6; } - if $PYTHON3 -c 'import sphinx;print(repr(sphinx.main))' >&5 2>&5 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - if test yes = "$with_python3" ; then - as_fn_error $? "Couldn't import sphinx module and call sphinx.main() for Python3 - try package python3-sphinx" "$LINENO" 5 - fi - PYTHON3= - fi if test -n "$PYTHON3" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PYTHON3_INC/Python.h" >&5 $as_echo_n "checking for $PYTHON3_INC/Python.h... " >&6; } Index: xapian-bindings-1.4.3/configure.ac =================================================================== --- xapian-bindings-1.4.3.orig/configure.ac +++ xapian-bindings-1.4.3/configure.ac @@ -350,16 +350,6 @@ if test no != "$with_python" ; then fi fi fi - AC_MSG_CHECKING([for python2 sphinx module]) - if $PYTHON2 -c 'import sphinx;print(repr(sphinx.main))' >&5 2>&5 ; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - if test yes = "$with_python2" ; then - AC_MSG_ERROR([Couldn't import sphinx module and call sphinx.main() for Python2 - try package python-sphinx]) - fi - PYTHON2= - fi if test -n "$PYTHON2" ; then dnl Check that Python.h is there, which is a good way to check that dnl the appropriate python-dev package has been installed. @@ -440,16 +430,6 @@ if test no != "$with_python3" ; then fi fi fi - AC_MSG_CHECKING([for python3 sphinx module]) - if $PYTHON3 -c 'import sphinx;print(repr(sphinx.main))' >&5 2>&5 ; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - if test yes = "$with_python3" ; then - AC_MSG_ERROR([Couldn't import sphinx module and call sphinx.main() for Python3 - try package python3-sphinx]) - fi - PYTHON3= - fi if test -n "$PYTHON3" ; then dnl Check that Python.h is there, which is a good way to check that dnl the appropriate python3-dev package has been installed. ++++++ xapian-bindings-1.4.1.tar.xz -> xapian-bindings-1.4.3.tar.xz ++++++ ++++ 82626 lines of diff (skipped)
