From 2843dc3c6783f3c8c435d41e4f39ac546d3a9d87 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Thu, 7 Feb 2013 12:08:22 +0100 Subject: [PATCH] The 1.1.15 rebase obsoletes the patch from 1.1.14-2 --- ...-comments-for-ldb_connect-to-the-rig.patch | 56 ------------------- libldb.spec | 7 ++- 2 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 0001-ldb-Move-doxygen-comments-for-ldb_connect-to-the-rig.patch diff --git a/0001-ldb-Move-doxygen-comments-for-ldb_connect-to-the-rig.patch b/0001-ldb-Move-doxygen-comments-for-ldb_connect-to-the-rig.patch deleted file mode 100644 index 814c38c..0000000 --- a/0001-ldb-Move-doxygen-comments-for-ldb_connect-to-the-rig.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 813bd0353fda0eb6d7c78392d5abd3002115da96 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Wed, 2 Jan 2013 11:22:16 -0500 -Subject: [PATCH] ldb: Move doxygen comments for ldb_connect to the right place - -Reviewed-by: Andreas Schneider - -Autobuild-User(master): Andreas Schneider -Autobuild-Date(master): Mon Jan 14 16:21:02 CET 2013 on sn-devel-104 - -diff --git a/lib/ldb/include/ldb.h b/lib/ldb/include/ldb.h -index b60fc9b5ebb94096fa823fe8981aa57998a27bea..748def9435f39e9194b3313d434a6ef6152796ed 100644 ---- a/lib/ldb/include/ldb.h -+++ b/lib/ldb/include/ldb.h -@@ -1033,6 +1033,18 @@ int ldb_global_init(void); - */ - struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx); - -+typedef void (*ldb_async_timeout_fn) (void *); -+typedef bool (*ldb_async_callback_fn) (void *); -+typedef int (*ldb_async_ctx_add_op_fn)(void *, time_t, void *, ldb_async_timeout_fn, ldb_async_callback_fn); -+typedef int (*ldb_async_ctx_wait_op_fn)(void *); -+ -+void ldb_async_ctx_set_private_data(struct ldb_context *ldb, -+ void *private_data); -+void ldb_async_ctx_set_add_op(struct ldb_context *ldb, -+ ldb_async_ctx_add_op_fn add_op); -+void ldb_async_ctx_set_wait_op(struct ldb_context *ldb, -+ ldb_async_ctx_wait_op_fn wait_op); -+ - /** - Connect to a database. - -@@ -1056,19 +1068,6 @@ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx) - (that is, with LDB_FLG_RDONLY). However in read-write mode, the database will be - created if it does not exist. - */ -- --typedef void (*ldb_async_timeout_fn) (void *); --typedef bool (*ldb_async_callback_fn) (void *); --typedef int (*ldb_async_ctx_add_op_fn)(void *, time_t, void *, ldb_async_timeout_fn, ldb_async_callback_fn); --typedef int (*ldb_async_ctx_wait_op_fn)(void *); -- --void ldb_async_ctx_set_private_data(struct ldb_context *ldb, -- void *private_data); --void ldb_async_ctx_set_add_op(struct ldb_context *ldb, -- ldb_async_ctx_add_op_fn add_op); --void ldb_async_ctx_set_wait_op(struct ldb_context *ldb, -- ldb_async_ctx_wait_op_fn wait_op); -- - int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[]); - - /* --- -1.8.1 - diff --git a/libldb.spec b/libldb.spec index fc0044c..ad0a3a8 100644 --- a/libldb.spec +++ b/libldb.spec @@ -9,7 +9,7 @@ Name: libldb Version: 1.1.15 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries Summary: A schema-less, ldap like, API and database Requires: libtalloc >= %{talloc_version} @@ -42,7 +42,6 @@ Provides: bundled(libreplace) Provides: bundled(libtdb_compat) # Patches -Patch0001: 0001-ldb-Move-doxygen-comments-for-ldb_connect-to-the-rig.patch %description An extensible library that implements an LDAP like API to access remote LDAP @@ -87,7 +86,6 @@ Development files for the Python bindings for the LDB library %prep %setup -q -n ldb-%{version} -%patch0001 -p3 -b .docs %build @@ -179,6 +177,9 @@ rm -rf %{buildroot} %postun -n pyldb -p /sbin/ldconfig %changelog +* Thu Feb 07 2013 Jakub Hrozek - 1.1.15-2 +- The 1.1.15 rebase obsoletes the patch from 1.1.14-2 + * Thu Feb 07 2013 Jakub Hrozek - 1.1.15-1 - New upstream release 1.1.15