From 3a10c2800012779e9551d047371b73264abbf2edbf274d78ec338868bac9d3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Thu, 31 May 2012 14:04:46 +0000
Subject: [PATCH] - BuildRequire libtalloc-devel, libtdb-devel, and
 libtevent-devel. - Configure with bundled tdb2 library.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=5
---
 ldb-tools.rpmlintrc |  2 ++
 ldb.changes         |  6 ++++++
 ldb.spec            | 18 +++++++-----------
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 ldb-tools.rpmlintrc

diff --git a/ldb-tools.rpmlintrc b/ldb-tools.rpmlintrc
new file mode 100644
index 0000000..423a1fe
--- /dev/null
+++ b/ldb-tools.rpmlintrc
@@ -0,0 +1,2 @@
+# non PIE is ok for tdbbackup tdbdump tdbtool
+setBadness('non-position-independent-executable',0)
diff --git a/ldb.changes b/ldb.changes
index 333e886..ce34889 100644
--- a/ldb.changes
+++ b/ldb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 31 13:46:42 UTC 2012 - lmuelle@suse.com
+
+- BuildRequire libtalloc-devel, libtdb-devel, and libtevent-devel.
+- Configure with bundled tdb2 library.
+
 -------------------------------------------------------------------
 Fri May 25 11:12:36 UTC 2012 - lmuelle@suse.com
 
diff --git a/ldb.spec b/ldb.spec
index 22da106..033f001 100644
--- a/ldb.spec
+++ b/ldb.spec
@@ -25,10 +25,9 @@ BuildRequires:  pkg-config
 %else
 BuildRequires:  pkgconfig
 %endif
-#!BuildIgnore:  libtalloc-devel
-BuildRequires:  libtalloc2-devel >= 2.0.7
-BuildRequires:  libtdb1-devel >= 1.2.10
-BuildRequires:  libtevent0-devel >= 0.9.15
+BuildRequires:  libtalloc-devel >= 2.0.7
+BuildRequires:  libtdb-devel >= 1.2.10
+BuildRequires:  libtevent-devel >= 0.9.15
 BuildRequires:  python-tdb >= 1.2.10
 BuildRequires:  python-devel
 BuildRequires:  python-tevent >= 0.9.15
@@ -91,8 +90,6 @@ CONFIGURE_OPTIONS="\
 	--with-modulesdir=%{_libdir} \
 	--bundled-libraries=tdb2 \
 "
-#	--bundled-libraries=NONE \
-#	--bundled-libraries=!tdb \
 ./configure ${CONFIGURE_OPTIONS}
 %{__make} %{build_make_smp_mflags} \
 	all
@@ -112,13 +109,13 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %files
 %defattr(-,root,root)
 %{_libdir}/libldb.so.*
+%{_libdir}/libpyldb-util.so.*
+%dir %{_libdir}/ldb
 %{_libdir}/ldb/libccan.so.*
 %{_libdir}/ldb/libpytalloc-util.so.*
 %{_libdir}/ldb/libtdb.so.*
-%{_libdir}/libpyldb-util.so.*
 %{_libdir}/ldb/libtdb_compat.so
 %{_libdir}/ldb/asq.so
-#%{_libdir}/ldb/ldap.so
 %{_libdir}/ldb/paged_results.so
 %{_libdir}/ldb/paged_searches.so
 %{_libdir}/ldb/rdn_name.so
@@ -137,18 +134,18 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_includedir}/pyldb.h
 %{_includedir}/pytalloc.h
 %{_libdir}/libldb.so
+%dir %{_libdir}/ldb
 %{_libdir}/ldb/libldb-cmdline.so
 %{_libdir}/ldb/libpopt.so
 %{_libdir}/libpyldb-util.so
 %{_libdir}/pkgconfig/ldb.pc
 %{_libdir}/pkgconfig/pyldb-util.pc
 %{_libdir}/python%{python_version}/site-packages/ldb.so
-%{_libdir}/python%{python_version}/site-packages/_tevent.so
 %{_libdir}/python%{python_version}/site-packages/talloc.so
 %{_libdir}/python%{python_version}/site-packages/tdb.so
-%{_libdir}/python%{python_version}/site-packages/tevent.py
 
 %files -n ldb-tools
+%defattr(-,root,root)
 %{_bindir}/ldbadd
 %{_bindir}/ldbdel
 %{_bindir}/ldbedit
@@ -160,5 +157,4 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_bindir}/tdbrestore
 %{_bindir}/tdbtool
 
-
 %changelog