[libtdb] - New upstream bugfix release - Adds a new tdbrestore utility - Convert to new WAF build-system - Ad

[Stephen Gallagher]

commit f594f82d6463ed336c27408314a8d84ab6103862
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jan 11 16:31:40 2011 -0500

    - New upstream bugfix release
    - Adds a new tdbrestore utility
    - Convert to new WAF build-system
    - Add python bindings in new python-tdb subpackage

 libtdb.spec |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/libtdb.spec b/libtdb.spec
index 2b3b0ad..3b95b43 100644
--- a/libtdb.spec
+++ b/libtdb.spec
@@ -1,6 +1,12 @@
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print(get_python_version())")}
+
 Name: libtdb
-Version: 1.2.1
-Release: 3%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 Group: System Environment/Daemons
 Summary: The tdb library
 License: LGPLv3+
@@ -11,6 +17,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
+BuildRequires: python-devel
 
 %description
 A library that implements a trivial database.
@@ -32,12 +39,20 @@ Requires: libtdb = %{version}-%{release}
 %description -n tdb-tools
 Tools to manage Tdb files
 
+%package -n python-tdb
+Group: Development/Libraries
+Summary: Python bindings for the Tdb library
+Requires: libtdb = %{version}-%{release}
+
+%description -n python-tdb
+Python bindings for libtdb
+
 %prep
 %setup -q -n tdb-%{version}
 
 %build
 ./autogen.sh
-%configure --prefix=%{_usr} --disable-python
+%configure --disable-rpath --bundled-libraries=NONE
 make %{?_smp_mflags}
 
 %install
@@ -48,6 +63,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/tdb.so
 
+# Work around incorrect build-system location
+if [ ! -e $RPM_BUILD_ROOT/%{python_sitearch}/tdb.so ]; then
+    mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}
+    mv $RPM_BUILD_ROOT/usr/lib/python%{python_version}/site-packages/tdb.so \
+       $RPM_BUILD_ROOT/%{python_sitearch}
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,10 +88,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/tdbbackup
 %{_bindir}/tdbdump
 %{_bindir}/tdbtool
+%{_bindir}/tdbrestore
 %{_mandir}/man8/tdbbackup.8*
 %{_mandir}/man8/tdbdump.8*
 %{_mandir}/man8/tdbtool.8*
+%{_mandir}/man8/tdbrestore.8*
 
+%files -n python-tdb
+%defattr(-,root,root,-)
+%{python_sitearch}/tdb.so
 
 %post
 /sbin/ldconfig
@@ -79,6 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %changelog
+* Tue Jan 11 2011 Stephen Gallagher <sgallagh at redhat.com> - 1.2.9-1
+- New upstream bugfix release
+- Adds a new tdbrestore utility
+- Convert to new WAF build-system
+- Add python bindings in new python-tdb subpackage
+
 * Wed Feb 24 2010 Simo Sorce <ssorce at redhat.com> - 1.2.1-3
 - add missing build require