diff --git a/baselibs.conf b/baselibs.conf index 1a56bdf..7808972 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -12,6 +12,7 @@ libregistry0 libsamba-credentials0 libsamba-hostconfig0 libsamba-passdb0 + obsoletes "libpdb0- < " libsamba-policy0 libsamba-util0 libsamdb0 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d0c549c..24bffb7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3642be5ce0cf70ea73bf6e126c62a3bd73dc16ab552ff59e0cca50de1db17bdb -size 29288 +oid sha256:468f074b32e91957209e900e37bedf88f81bd4a7c7b8dd2ed4df37f7b31f4d04 +size 29300 diff --git a/samba.changes b/samba.changes index b2e2aeb..f3773ad 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com + +- Do not provide libpdb0 from libsamba-passdb0 but add it to baselibs.conf + instead; (bnc#942716). + ------------------------------------------------------------------- Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index f7dc807..6540342 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3487 +%define SOURCE_TIMESTAMP 3489 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -765,7 +765,6 @@ Branch: %{BRANCH} Summary: Samba3 password database library License: GPL-3.0+ Group: System/Libraries -Provides: libpdb0 Obsoletes: libpdb0 %description -n libsamba-passdb0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1c83474..d1ae496 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:926178c7362c5c0c0688a6a829d82be5111576875f65a066520777bd0ba10e17 -size 52947 +oid sha256:aa4c986d1f9138d58aa4da6a0fcb0a94367b8170152136e96b4e42058e64d8d8 +size 52914