Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ldb for openSUSE:Factory checked in
at 2022-01-22 08:17:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ldb (Old)
and /work/SRC/openSUSE:Factory/.ldb.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ldb"
Sat Jan 22 08:17:48 2022 rev:57 rq:946250 version:2.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ldb/ldb.changes 2021-11-12 15:59:53.158582179
+0100
+++ /work/SRC/openSUSE:Factory/.ldb.new.1938/ldb.changes 2022-01-22
08:17:52.927025881 +0100
@@ -1,0 +2,8 @@
+Tue Jan 11 10:08:31 UTC 2022 - Samuel Cabrero <scabr...@suse.de>
+
+- Modify packaging to allow parallel installation with libldb1
+ (bsc#1192684):
+ + Private libraries are installed in %{_libdir}/ldb2/
+ + Modules are installed in %{_libdir}/ldb2/modules
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ldb.spec ++++++
--- /var/tmp/diff_new_pack.kklVrm/_old 2022-01-22 08:17:54.259016905 +0100
+++ /var/tmp/diff_new_pack.kklVrm/_new 2022-01-22 08:17:54.263016878 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ldb
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -75,8 +75,7 @@
%package -n libldb2
Summary: An LDAP-like embedded database
Group: System/Libraries
-Provides: libldb1
-Obsoletes: libldb1
+Obsoletes: libldb1 < %{version}
%description -n libldb2
LDB is an LDAP-like embedded database.
@@ -123,7 +122,7 @@
%prep
%setup -n ldb-%{version} -q
-%patch0 -p1
+%autopatch -p1
%build
%if 0%{?suse_version} > 1110
@@ -144,7 +143,8 @@
--disable-rpath \
--disable-rpath-install \
--disable-silent-rules \
- --with-modulesdir=%{_libdir} \
+ --with-modulesdir=%{_libdir}/ldb2/modules \
+ --with-privatelibdir=%{_libdir}/ldb2 \
--bundled-libraries=%{bundled_libs} \
--builtin-libraries=replace \
%if !%{with_lmdb}
@@ -183,29 +183,31 @@
%files -n libldb2
%defattr(-,root,root)
-%{_libdir}/libldb.so.*
-%dir %{_libdir}/ldb
-%{_libdir}/ldb/asq.so
-%{_libdir}/ldb/paged_searches.so
-%{_libdir}/ldb/rdn_name.so
-%{_libdir}/ldb/sample.so
-%{_libdir}/ldb/server_sort.so
-%{_libdir}/ldb/skel.so
-%{_libdir}/ldb/tdb.so
+%{_libdir}/libldb.so.2*
+%dir %{_libdir}/ldb2
+%{_libdir}/ldb2/libldb-key-value.so
+%{_libdir}/ldb2/libldb-tdb-err-map.so
+%{_libdir}/ldb2/libldb-tdb-int.so
+%dir %{_libdir}/ldb2/modules
+%dir %{_libdir}/ldb2/modules/ldb
+%{_libdir}/ldb2/modules/ldb/asq.so
+%{_libdir}/ldb2/modules/ldb/paged_searches.so
+%{_libdir}/ldb2/modules/ldb/rdn_name.so
+%{_libdir}/ldb2/modules/ldb/sample.so
+%{_libdir}/ldb2/modules/ldb/server_sort.so
+%{_libdir}/ldb2/modules/ldb/skel.so
+%{_libdir}/ldb2/modules/ldb/tdb.so
+%{_libdir}/ldb2/modules/ldb/ldb.so
%if 0%{?suse_version} <= 1500
-%{_libdir}/ldb/libcmocka-ldb.so
+%{_libdir}/ldb2/libcmocka-ldb.so
%endif
%ifarch ppc
-%{_libdir}/ldb/libcmocka-ldb.so
+%{_libdir}/ldb2/libcmocka-ldb.so
%endif
-%{_libdir}/ldb/ldb.so
-%{_libdir}/ldb/libldb-key-value.so
%if %{with_lmdb}
-%{_libdir}/ldb/libldb-mdb-int.so
-%{_libdir}/ldb/mdb.so
+%{_libdir}/ldb2/libldb-mdb-int.so
+%{_libdir}/ldb2/modules/ldb/mdb.so
%endif
-%{_libdir}/ldb/libldb-tdb-err-map.so
-%{_libdir}/ldb/libldb-tdb-int.so
%files -n libldb-devel
%defattr(-,root,root)
@@ -215,7 +217,6 @@
%{_includedir}/ldb_module.h
%{_includedir}/ldb_version.h
%{_libdir}/libldb.so
-%dir %{_libdir}/ldb
%{_libdir}/pkgconfig/ldb.pc
%{_mandir}/man3/ldb*.3.*
%{_mandir}/man3/ldif*.3.*
@@ -228,7 +229,7 @@
%{_bindir}/ldbmodify
%{_bindir}/ldbrename
%{_bindir}/ldbsearch
-%{_libdir}/ldb/libldb-cmdline.so
+%{_libdir}/ldb2/libldb-cmdline.so
%{_mandir}/man1/ldbadd.1.*
%{_mandir}/man1/ldbdel.1.*
%{_mandir}/man1/ldbedit.1.*
