1.2.4, add tcl and php

3 files changed, 52 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 8a96469..8855ef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xapian-bindings-1.2.2.tar.gz
 /xapian-bindings-1.2.3.tar.gz
+/xapian-bindings-1.2.4.tar.gz
diff --git a/sources b/sources
index 41d3c44..8ae4604 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad09f47150de5c02c036cf9219040127  xapian-bindings-1.2.3.tar.gz
+b3d078883b259eec1bbaff8982feabbe  xapian-bindings-1.2.4.tar.gz
diff --git a/xapian-bindings.spec b/xapian-bindings.spec
index c2f7805..a846397 100644
--- a/xapian-bindings.spec
+++ b/xapian-bindings.spec
@@ -1,9 +1,11 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name:          xapian-bindings
-Version:       1.2.3
+Version:       1.2.4
 Release:       1%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
@@ -14,9 +16,11 @@ Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.t
 Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libuuid-devel
+BuildRequires: php-devel
 BuildRequires: python-devel
 BuildRequires: ruby
 BuildRequires: ruby-devel
+BuildRequires: tcl-devel
 BuildRequires: xapian-core-devel
 BuildRequires: zlib-devel
 
@@ -24,22 +28,35 @@ BuildRequires: zlib-devel
 Xapian is an Open Source Probabilistic Information Retrieval Library. 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 scripts which use Xapian
+files needed for scripts which use Xapian.
+
+%package -n php-xapian
+Group:         Development/Libraries
+Summary:       Files needed for developing PHP scripts which use Xapian
+Requires:      %{name} = %{version}-%{release}
+Requires:      php(api) = %{php_core_api}
+
+%description -n php-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 PHP scripts which use Xapian.
 
 %package python
 Group:         Development/Libraries
 Summary:       Files needed for developing Python scripts which use Xapian
-Obsoletes:     pyxapian
+Requires:      %{name} = %{version}-%{release}
 
 %description python
 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
+files needed for developing Python scripts which use Xapian.
 
 %package ruby
 Group:         Development/Libraries
 Summary:       Files needed for developing Ruby scripts which use Xapian
+Requires:      %{name} = %{version}-%{release}
 
 %description ruby
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -47,11 +64,22 @@ 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 Ruby scripts which use Xapian
 
+%package -n tcl-xapian
+Group:         Development/Libraries
+Summary:       Files needed for developing TCL scripts which use Xapian
+Requires:      %{name} = %{version}-%{release}
+
+%description -n tcl-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 TCL scripts which use Xapian
+
 %prep
 %setup -q
 
 %build
-%configure --with-python --with-ruby
+%configure --with-php --with-python --with-ruby --with-tcl
 make %{?_smp_mflags} V=1
 
 %install
@@ -64,20 +92,35 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %clean
 rm -rf %{buildroot}
 
-%files python
+%files
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING NEWS README
+
+%files -n php-xapian
+%defattr(-, root, root)
+%{_libdir}/php/modules/xapian.so
+%{_datadir}/php5/xapian.php
+
+%files python
+%defattr(-, root, root)
 %doc python/docs/examples
 %{python_sitearch}/*
 
 %files ruby
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING NEWS README
 %doc ruby/docs/rdocs ruby/docs/examples
 %{ruby_sitearch}/_xapian.so
 %{ruby_sitelib}/xapian.rb
 
+%files -n tcl-xapian
+%defattr(-, root, root)
+%{_libdir}/tcl8.5/xapian%{version}/
+
 %changelog
+* Sun Jan 16 2011 Peter Robinson<pbrobinson@gmail.com> 1.2.4-1
+- Update to new 1.2.4 release
+- enable tcl and php bindings
+
 * Mon Aug 30 2010 Peter Robinson<pbrobinson@gmail.com> 1.2.3-1
 - Update to new stable 1.2.3 release