Accepting request 131015 from network:samba:STABLE

- Remove superfluous ldb-tools rpmlintrc file.
- Update to 1.1.10.
  + Enhancements and fixes to the s3 read, sesssetup, and server functions
  + s3: Fix a crash in reply_lockingX_error
  + s3:libsmb, smbd, and s4:libcli: add EXTENDED_SIGNATURE support in tcon
  + s3:rpc_server: make usage of session_extract_session_key()
  + s3:smb2_*: make use of SMBD_SMB2_*()
  + s4 and libcli: enahncements and fixes
- Update to 1.1.9.
  + Ensure rename target does not exist before deleting old record.
  + Add parameter to avoid NULL format string flagged by -Werror=format.
- Update to 1.1.8.
  + Fixes for pyldb.
  + Drop support for tdb_compat.
- BuildRequire pytalloc-devel.
- Disable rpath while configure.
- Tag GPL-3.0+ based on tdb license; (bnc#765270).
- Define library name and use it instead of libldb1.

OBS-URL: https://build.opensuse.org/request/show/131015
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ldb?expand=0&rev=3

ldb-1.1.10.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:191f015bf8e0947d9e9c7b49261a5b5cbf31fa968c0e59deb2d225087545d1c1
+size 1106879

ldb-1.1.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:048021224d36adac86d348f62ca6753454e39155e207af2e2ca8cde54fd0006d
-size 1613612

ldb-tools.rpmlintrc

@@ -1,2 +0,0 @@
-# non PIE is ok for tdbbackup tdbdump tdbtool
-setBadness('non-position-independent-executable',0)

ldb.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Thu Aug 16 09:46:57 UTC 2012 - lmuelle@suse.com
+
+- Remove superfluous ldb-tools rpmlintrc file.
+
+-------------------------------------------------------------------
+Thu Aug  9 18:06:08 UTC 2012 - lmuelle@suse.com
+
+- Update to 1.1.10.
+  + Enhancements and fixes to the s3 read, sesssetup, and server functions
+  + s3: Fix a crash in reply_lockingX_error
+  + s3:libsmb, smbd, and s4:libcli: add EXTENDED_SIGNATURE support in tcon
+  + s3:rpc_server: make usage of session_extract_session_key()
+  + s3:smb2_*: make use of SMBD_SMB2_*()
+  + s4 and libcli: enahncements and fixes
+
+-------------------------------------------------------------------
+Tue Aug  7 22:18:19 UTC 2012 - lmuelle@suse.com
+
+- Update to 1.1.9.
+  + Ensure rename target does not exist before deleting old record.
+  + Add parameter to avoid NULL format string flagged by -Werror=format.
+- Update to 1.1.8.
+  + Fixes for pyldb.
+  + Drop support for tdb_compat.
+- BuildRequire pytalloc-devel.
+
+-------------------------------------------------------------------
+Thu Jun 28 16:29:25 UTC 2012 - lmuelle@suse.com
+
+- Disable rpath while configure.
+
+-------------------------------------------------------------------
+Wed Jun 13 14:16:37 UTC 2012 - ddiss@suse.com
+
+- Tag GPL-3.0+ based on tdb license; (bnc#765270).
+
+-------------------------------------------------------------------
+Sun Jun  3 21:18:46 UTC 2012 - lmuelle@suse.com
+
+- Define library name and use it instead of libldb1.
+
 -------------------------------------------------------------------
 Sun Jun  3 14:03:09 UTC 2012 - lmuelle@suse.com
 

ldb.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package ldb (Version 1.1.6)
+# spec file for package ldb
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,14 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %{!?python_sitearch:  %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define talloc_version 2.0.7
 %define tdb_version 1.2.10
-%define tevent_version 0.9.15
+%define tevent_version 0.9.16
-
 
 Name:           ldb
 #!BuildIgnore: libtalloc
@@ -30,20 +28,21 @@ BuildRequires:  libtalloc-devel >= %{talloc_version}
 BuildRequires:  libtdb-devel >= %{tdb_version}
 BuildRequires:  libtevent-devel >= %{tevent_version}
 BuildRequires:  popt-devel
-BuildRequires:  python-tdb >= %{tdb_version}
+BuildRequires:  pytalloc-devel >= %{talloc_version}
 BuildRequires:  python-devel
+BuildRequires:  python-tdb >= %{tdb_version}
 BuildRequires:  python-tevent >= %{tevent_version}
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 %define	build_make_smp_mflags %{?_smp_mflags}
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-License:        LGPL-3.0+
-Group:          System/Libraries
 Url:            http://ldb.samba.org/
-Version:        1.1.6
+Version:        1.1.10
 Release:        0
 Summary:        An LDAP-like embedded database
+License:        GPL-3.0+
+Group:          System/Libraries
 Source:         http://download.samba.org/pub/ldb/ldb-%{version}.tar.gz
 Source4:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -52,8 +51,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Ldb is an LDAP-like embedded database.
 
 
-%package -n libldb1
+%define libldb_name libldb1
-License:        LGPL-3.0+
+%package -n %{libldb_name}
 Summary:        An LDAP-like embedded database
 Group:          System/Libraries
 %if 0%{?suse_version} > 1020
@@ -63,17 +62,16 @@ BuildRequires:  pkgconfig
 %endif
 PreReq:         /sbin/ldconfig
 
-%description -n libldb1
+%description -n %{libldb_name}
 Ldb is an LDAP-like embedded database.
 
 This package includes the ldb1 library.
 
 
 %package -n libldb-devel
-License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with ldb1 Support
 Group:          Development/Libraries/C and C++
-Requires:       libldb1 = %{version}
+Requires:       %{libldb_name} = %{version}
 
 %description -n libldb-devel
 Ldb is an LDAP-like embedded database.
@@ -82,7 +80,6 @@ Libraries and Header Files to Develop Programs with ldb1 Support
 
 
 %package -n ldb-tools
-License:        LGPL-3.0+
 Summary:        Tools to manipulate ldb files
 Group:          Development/Libraries/C and C++
 
@@ -107,34 +104,31 @@ export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOU
 CONFIGURE_OPTIONS="\
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
+	--disable-rpath \
 	--with-modulesdir=%{_libdir} \
-	--bundled-libraries=tdb2 \
+	--bundled-libraries=NONE \
+	--builtin-libraries=replace \
 "
 ./configure ${CONFIGURE_OPTIONS}
 %{__make} %{build_make_smp_mflags} \
 	all
 
 %check
+# make test doesn't work with --disable-rpath
 #%{__make} test
 
 %install
 DESTDIR=${RPM_BUILD_ROOT} make install
 
-%post -n libldb1
+%post -n %{libldb_name} -p /sbin/ldconfig
-/sbin/ldconfig
 
-%postun -n libldb1
+%postun -n %{libldb_name} -p /sbin/ldconfig
-/sbin/ldconfig
 
-%files -n libldb1
+%files -n %{libldb_name}
 %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}/ldb/libtdb_compat.so
 %{_libdir}/ldb/asq.so
 %{_libdir}/ldb/paged_results.so
 %{_libdir}/ldb/paged_searches.so
@@ -152,7 +146,6 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_includedir}/ldb_module.h
 %{_includedir}/ldb_version.h
 %{_includedir}/pyldb.h
-%{_includedir}/pytalloc.h
 %{_libdir}/libldb.so
 %dir %{_libdir}/ldb
 %{_libdir}/ldb/libldb-cmdline.so
@@ -160,8 +153,6 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_libdir}/pkgconfig/ldb.pc
 %{_libdir}/pkgconfig/pyldb-util.pc
 %{python_sitearch}/ldb.so
-%{python_sitearch}/talloc.so
-%{python_sitearch}/tdb.so
 
 %files -n ldb-tools
 %defattr(-,root,root)
@@ -171,9 +162,5 @@ DESTDIR=${RPM_BUILD_ROOT} make install
 %{_bindir}/ldbmodify
 %{_bindir}/ldbrename
 %{_bindir}/ldbsearch
-%{_bindir}/tdbbackup
-%{_bindir}/tdbdump
-%{_bindir}/tdbrestore
-%{_bindir}/tdbtool
 
 %changelog