diff --git a/0001-tdb-include-include-stdbool.h-in-tdb.h.patch b/0001-tdb-include-include-stdbool.h-in-tdb.h.patch new file mode 100644 index 0000000..33a15cb --- /dev/null +++ b/0001-tdb-include-include-stdbool.h-in-tdb.h.patch @@ -0,0 +1,27 @@ +From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 23 May 2014 10:08:14 -0700 +Subject: [PATCH] tdb/include: include stdbool.h in tdb.h + +Commit db5bda56bf08 (tdb: add TDB_MUTEX_LOCKING support) adds a bool, but does +not include stdbool.h. This causes any build including tdb.h to fail, at least +for me with GCC 4.9.0. +--- + lib/tdb/include/tdb.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/tdb.h b/include/tdb.h +index 5ea5e60..03e429c 100644 +--- a/include/tdb.h ++++ b/include/tdb.h +@@ -31,6 +31,7 @@ extern "C" { + #endif + + #include ++#include + + /** + * @defgroup tdb The tdb API +-- +1.9.3 + diff --git a/libtdb.spec b/libtdb.spec index d59f0ca..f67b3fd 100644 --- a/libtdb.spec +++ b/libtdb.spec @@ -6,12 +6,15 @@ Name: libtdb Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Daemons Summary: The tdb library License: LGPLv3+ URL: http://tdb.samba.org/ Source: http://samba.org/ftp/tdb/tdb-%{version}.tar.gz +# Fix missed include preventing builds against libtdb +# https://bugzilla.samba.org/show_bug.cgi?id=10625 +Patch0: 0001-tdb-include-include-stdbool.h-in-tdb.h.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf @@ -53,6 +56,7 @@ Python bindings for libtdb %prep %setup -q -n tdb-%{version} +%patch0 -p1 %build %configure --disable-rpath \ @@ -109,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %postun -n python-tdb -p /sbin/ldconfig %changelog +* Fri May 23 2014 Adam Williamson - 1.3.0-2 +- add a missing include to tdb.h (fixes builds against libtdb) (BSO #10625) + * Fri May 23 2014 Jakub Hrozek - 1.3.0-1 - New upstream release 1.3.0