Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.6:Update
xapian-bindings
do-not-use-sphinx.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File do-not-use-sphinx.diff of Package xapian-bindings
Index: xapian-bindings-1.4.4/configure =================================================================== --- xapian-bindings-1.4.4.orig/configure +++ xapian-bindings-1.4.4/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_python" ; 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' >&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 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.4/configure.ac =================================================================== --- xapian-bindings-1.4.4.orig/configure.ac +++ xapian-bindings-1.4.4/configure.ac @@ -351,16 +351,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_python" ; 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. @@ -441,16 +431,6 @@ if test no != "$with_python3" ; then fi fi fi - AC_MSG_CHECKING([for python3 sphinx module]) - if $PYTHON3 -c 'import sphinx' >&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 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. Index: xapian-bindings-1.4.4/python/Makefile.am =================================================================== --- xapian-bindings-1.4.4.orig/python/Makefile.am +++ xapian-bindings-1.4.4/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.4/python3/Makefile.am =================================================================== --- xapian-bindings-1.4.4.orig/python3/Makefile.am +++ xapian-bindings-1.4.4/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) PYTHONPATH=..:$$PYTHONPATH $(OSX_SIP_HACK_ENV) $(PYTHON3) \
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor