Hello community, here is the log from the commit of package xapian-bindings for openSUSE:Factory checked in at 2017-09-12 19:57:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xapian-bindings (Old) and /work/SRC/openSUSE:Factory/.xapian-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xapian-bindings" Tue Sep 12 19:57:53 2017 rev:26 rq:523631 version:1.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/xapian-bindings/xapian-bindings.changes 2017-07-04 13:42:54.246100699 +0200 +++ /work/SRC/openSUSE:Factory/.xapian-bindings.new/xapian-bindings.changes 2017-09-12 19:57:53.390028717 +0200 @@ -1,0 +2,13 @@ +Mon Sep 11 15:55:18 UTC 2017 - [email protected] + +- Create a new php7-xapian package in Tumbleweed instead of using php5 + which will be removed soon (boo#1058105) +- Add fix-php7-directory.patch to install xapian.php to the right directory. +- Disable creation of php bindings by default due to + https://trac.xapian.org/wiki/FAQ/PHP%20Bindings%20Package +- To build the php bindings locally, use : + * osc build --with=php + or download the src.rpm file and use: + * rpmbuild --rebuild xapian-bindings-1.4.4-0.src.rpm -D "with_php 1" + +------------------------------------------------------------------- New: ---- fix-php7-directory.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xapian-bindings.spec ++++++ --- /var/tmp/diff_new_pack.TTAE8E/_old 2017-09-12 19:57:54.033938177 +0200 +++ /var/tmp/diff_new_pack.TTAE8E/_new 2017-09-12 19:57:54.033938177 +0200 @@ -16,13 +16,18 @@ # +%bcond_with php %define php_extension_dir %(php-config --extension-dir) %bcond_with mono %if 0%{?suse_version} >= 1320 && 0%{?is_opensuse} %bcond_without sphinx +%define phpver php7 +%define phppkg php7 %else %bcond_with sphinx +%define phpver php5 +%define phppkg php %endif Name: xapian-bindings @@ -36,13 +41,20 @@ Source1: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring Patch0: do-not-use-sphinx.diff +Patch1: fix-php7-directory.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: java-devel +BuildRequires: libtool BuildRequires: libuuid-devel BuildRequires: libxapian-devel = %{version} %if %{with mono} BuildRequires: mono-devel %endif -BuildRequires: php5-devel >= 5.5 + +%if %{with php} +BuildRequires: %{phpver}-devel +%endif BuildRequires: pkg-config BuildRequires: python-devel >= 2.6 BuildRequires: python-setuptools @@ -85,17 +97,19 @@ This package provides the files needed for developing Python 3 scripts which use Xapian. -%package -n php-xapian +%if %{with php} +%package -n %{phppkg}-xapian Summary: Files needed for developing PHP scripts which use Xapian Group: Productivity/Networking/Web/Servers -Requires: php5 +Requires: %{phpver} -%description -n php-xapian +%description -n %{phppkg}-xapian Xapian is a probabilistic information retrieval library. It offers an adaptable toolkit that allows developers to add advanced indexing and search facilities to applications. This package provides the files needed for developing PHP scripts which use Xapian. +%endif %package -n ruby-xapian Summary: Files needed for developing Ruby scripts which use Xapian @@ -138,6 +152,9 @@ %if %{without sphinx} %patch0 -p1 %endif +%if %{with php} && %{phpver} == php7 +%patch1 -p1 +%endif %build @@ -146,7 +163,9 @@ %configure \ --with-python \ --with-python3 \ - --with-php \ +%if %{with php} + --with-%{phppkg} \ +%endif --with-ruby \ --with-tcl \ %if %{without mono} @@ -177,13 +196,15 @@ %doc %{_defaultdocdir}/%{name}/python3/ %{python3_sitearch}/xapian/ -%files -n php-xapian +%if %{with php} +%files -n %{phppkg}-xapian %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog HACKING NEWS README TODO %dir %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}/php/ %{php_extension_dir}/xapian.so -%{_datadir}/php5/xapian.php +%{_datadir}/%{phpver}/xapian.php +%endif %files -n ruby-xapian %defattr(-,root,root) ++++++ fix-php7-directory.patch ++++++ Index: xapian-bindings-1.4.4/php7/Makefile.am =================================================================== --- xapian-bindings-1.4.4.orig/php7/Makefile.am +++ xapian-bindings-1.4.4/php7/Makefile.am @@ -39,7 +39,7 @@ phpext_LTLIBRARIES = xapian.la # This location is correct for Debian, but in general there doesn't seem # to be a suitable location which is guaranteed to be in the include_path # by default. -phpincdir = $(datadir)/php +phpincdir = $(datadir)/php7 phpinc_DATA = php7/xapian.php # Remove the .la file - xapian.la is never linked against (it's a module)
