diff --git a/.gitignore b/.gitignore index 5f5164e..6813066 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tdb-1.2.12.tar.gz +SOURCES/tdb-1.3.0.tar.gz diff --git a/.libtdb.metadata b/.libtdb.metadata index 95990f4..57b6796 100644 --- a/.libtdb.metadata +++ b/.libtdb.metadata @@ -1 +1 @@ -5c6d0b7108a261e7a57172f8ae06b6d327217dfd SOURCES/tdb-1.2.12.tar.gz +44ed95d6b58670d2835a8703d44ab1a40173960e SOURCES/tdb-1.3.0.tar.gz diff --git a/SOURCES/0001-tdb-include-include-stdbool.h-in-tdb.h.patch b/SOURCES/0001-tdb-include-include-stdbool.h-in-tdb.h.patch new file mode 100644 index 0000000..33a15cb --- /dev/null +++ b/SOURCES/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/SPECS/libtdb.spec b/SPECS/libtdb.spec index ceaaa15..017e396 100644 --- a/SPECS/libtdb.spec +++ b/SPECS/libtdb.spec @@ -5,8 +5,8 @@ %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print(get_python_version())")} Name: libtdb -Version: 1.2.12 -Release: 3%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Group: System Environment/Daemons Summary: The tdb library License: LGPLv3+ @@ -22,6 +22,7 @@ BuildRequires: python-devel Provides: bundled(libreplace) # Patches +Patch0001: 0001-tdb-include-include-stdbool.h-in-tdb.h.patch %description A library that implements a trivial database. @@ -53,6 +54,7 @@ Python bindings for libtdb %prep %setup -q -n tdb-%{version} +%patch0001 -p1 -b .stdbool %build %configure --disable-rpath \ @@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %postun -n python-tdb -p /sbin/ldconfig %changelog +* Thu Sep 4 2014 Jakub Hrozek - 1.3.0-1 +- Resolves: rhbz#1133915 - Rebase libtdb to version 1.3.0 or newer + * Fri Jan 24 2014 Daniel Mach - 1.2.12-3 - Mass rebuild 2014-01-24