[libldb] New upstream release Add ldb_module_error() routine Fedora: work around unreliable configure check f

[Stephen Gallagher]

commit e94d5d7b382fae8664d8119d6ce2cdcdb475502f
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Dec 7 07:45:06 2011 -0500

    New upstream release
    Add ldb_module_error() routine
    Fedora: work around unreliable configure check for pytevent
    Drop patch to ignore --disable-silent-rules (included in tarball)

 .gitignore                                         |    1 +
 ...dded-autoconf-disable-silent-rules-option.patch |   30 --------------------
 FED01-fix-tevent-check.patch                       |   13 ++++++++
 libldb.spec                                        |   17 ++++++++--
 sources                                            |    2 +-
 5 files changed, 28 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60d4dd1..601e814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /ldb-1.0.2.tar.gz
 /ldb-1.1.0.tar.gz
 /ldb-1.1.3.tar.gz
+/ldb-1.1.4.tar.gz
diff --git a/FED01-fix-tevent-check.patch b/FED01-fix-tevent-check.patch
new file mode 100644
index 0000000..e039589
--- /dev/null
+++ b/FED01-fix-tevent-check.patch
@@ -0,0 +1,13 @@
+diff -ruN ldb-1.1.4.orig/buildtools/wafsamba/samba_bundled.py ldb-1.1.4/buildtools/wafsamba/samba_bundled.py
+--- ldb-1.1.4.orig/buildtools/wafsamba/samba_bundled.py	2011-11-14 12:01:10.000000000 -0500
++++ ldb-1.1.4/buildtools/wafsamba/samba_bundled.py	2011-12-07 07:33:40.685193659 -0500
+@@ -228,7 +228,8 @@
+         try:
+             version = m.__version__
+         except AttributeError:
+-            found = False
++            Logs.warn('WARNING: Could not determine if %s is of version %s or later. Assuming it is.' % (libname, minversion))
++            found = True
+         else:
+             found = tuple(version.split(".")) >= tuple(minversion.split("."))
+     if not found and not conf.LIB_MAY_BE_BUNDLED(libname):
diff --git a/libldb.spec b/libldb.spec
index 78953b3..b459a69 100644
--- a/libldb.spec
+++ b/libldb.spec
@@ -8,8 +8,8 @@
 %define tevent_version 0.9.14
 
 Name: libldb
-Version: 1.1.3
-Release: 4%{?dist}
+Version: 1.1.4
+Release: 1%{?dist}
 Group: Development/Libraries
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc >= %{talloc_version}
@@ -35,6 +35,7 @@ BuildRequires: docbook-style-xsl
 BuildRequires: python-devel
 BuildRequires: python-tdb
 BuildRequires: pytalloc-devel
+BuildRequires: python-tevent
 BuildRequires: doxygen
 
 Provides: bundled(libreplace)
@@ -42,7 +43,8 @@ Provides: bundled(libtdb_compat)
 Provides: bundled(libccan)
 
 # Patches
-Patch1001: 0001-build-added-autoconf-disable-silent-rules-option.patch
+
+Patch1001: FED01-fix-tevent-check.patch
 
 %description
 An extensible library that implements an LDAP like API to access remote LDAP
@@ -87,6 +89,7 @@ Development files for the Python bindings for the LDB library
 
 %prep
 %setup -q -n ldb-%{version}
+
 %patch1001 -p1
 
 %build
@@ -109,7 +112,7 @@ make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/libldb.a
 
 # Remove _tevent.so (it's managed by python-tevent)
-rm -f %{buildroot}/%{python_sitearch}/_tevent.so
+#rm -f %{buildroot}/%{python_sitearch}/_tevent.so
 
 # Shared libraries need to be marked executable for
 # rpmbuild to strip them and include them in debuginfo
@@ -177,6 +180,12 @@ rm -rf %{buildroot}
 %postun -n pyldb -p /sbin/ldconfig
 
 %changelog
+* Tue Dec 06 2011 Stephen Gallagher <sgallagh at redhat.com> - 1.1.4-1
+- New upstream release
+- Add ldb_module_error() routine
+- Fedora: work around unreliable configure check for pytevent
+- Drop patch to ignore --disable-silent-rules (included in tarball)
+
 * Thu Dec 01 2011 Stephen Gallagher <sgallagh at redhat.com> - 1.1.3-4
 - Add patch to ignore --disable-silent-rules
 
diff --git a/sources b/sources
index 6d2d3d9..44b3d36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-094133b399d1dfd33b38610b717b6767  ldb-1.1.3.tar.gz
+666a27a31ce96e48923dcbce6b6a21cb  ldb-1.1.4.tar.gz