- fix python install paths

- rel 3

diff --git a/python-install.patch b/python-install.patch
new file mode 100644 (file)
index 0000000..366bc0a
--- /dev/null
+++ b/python-install.patch
@@ -0,0 +1,11 @@
+--- xapian-bindings-1.2.21/configure.ac~       2015-05-21 14:57:01.000000000 +0900
++++ xapian-bindings-1.2.21/configure.ac        2016-03-30 21:24:31.826127813 +0900
+@@ -312,7 +312,7 @@
+       AC_MSG_RESULT(yes)
+       AC_MSG_CHECKING([for directory to install python bindings in])
+       if test -z "$PYTHON_LIB" ; then
+-        PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(1).replace(os.sep,"/"))'`
++        PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(plat_specific=True,prefix="/usr").replace(os.sep,"/"))'`
+       fi
+       AC_MSG_RESULT([$PYTHON_LIB])
+       AC_ARG_VAR(PYTHON_LIB, [Directory to install python bindings in])

diff --git a/xapian-bindings.spec b/xapian-bindings.spec
index e6353a005f846a096fba931dba8e43636676b6c7..bf920bbc90a0d610e89e8639edccbfb74dc2135a 100644 (file)
--- a/xapian-bindings.spec
+++ b/xapian-bindings.spec
@@ -14,11 +14,12 @@ Summary:    Bindings for Xapian
 Summary(pl.UTF-8):     Wiązania do Xapiana
 Name:          xapian-bindings
 Version:       1.2.21
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Development/Languages
 Source0:       http://oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5: 33c598a26fcf92ab15af6c65475ab8de
+Patch0:                python-install.patch
 URL:           http://www.xapian.org/
 %{?with_java:BuildRequires:    jdk >= 1.2}
 %{?with_java:BuildRequires:    jpackage-utils}
@@ -195,8 +196,11 @@ tworzeniu skryptów w Tcl-u wykorzystujących Xapiana.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
 CLASSPATH="." \
 RUBY_LIB=%{ruby_vendorlibdir} \
 RUBY_LIB_ARCH=%{ruby_vendorarchdir} \