diff --git a/build-source-timestamp b/build-source-timestamp
index 294441b..7ae1362 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2798
+2809
 Branch      : 3.6.5.PTF
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 62dc059..ce80ca8 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69e6748aecc26b93e4518843a20136491669ade44337ccb1e6059b7f193d334b
-size 53552
+oid sha256:3a734a1d3293ad44db285d112d883411d0319b690ae12d339304be90c952d977
+size 86289
diff --git a/samba-doc.spec b/samba-doc.spec
index 932b581..8c3a63d 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -82,23 +82,33 @@ BuildRequires:  pkg-config
 %else
 BuildRequires:  pkgconfig
 %endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
+BuildRequires:  libldb-devel
+#!BuildIgnore: libtalloc
+BuildRequires:  libtalloc-devel
+#!BuildIgnore: libtdb
+BuildRequires:  libtdb-devel
+BuildRequires:  libtevent-devel
+%endif
 %define	samba_ver 3.6.5
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
 %define	guards_symbols pre_1111
 %endif
-%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130
+%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
 %define	libldb_ver 1.0.2
 %define	libtalloc_ver 2.0.5
 %define	libtdb_ver 1.2.9
 %define	libtevent_ver 0.9.11
 %else
+%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131
 %define	libldb_ver %{version}
 %define	libtalloc_ver %{version}
 %define	libtdb_ver %{version}
 %define	libtevent_ver %{version}
 %endif
+%endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 %define	build_make_smp_mflags %{?_smp_mflags}
 %else
@@ -277,11 +287,9 @@ pushd source3
 %if 0%{?suse_version} && 0%{?suse_version} < 1141
 %{?suse_update_config:%{suse_update_config -f}}
 %endif
-#ln -s m4/aclocal.m4 aclocal.m4
-#autoreconf --force --install -I. -Im4 -I../lib/replace
-%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
 # Ensure all idl is recompiled, in case we are carrying pidl changes locally.
 rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho]
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
 ./autogen.sh
 %endif
 CONFIGURE_OPTIONS="\
@@ -451,7 +459,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %changelog
diff --git a/samba.changes b/samba.changes
index d03d391..59f6e95 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,10 +1,89 @@
+-------------------------------------------------------------------
+Fri Jun  1 23:01:11 UTC 2012 - lmuelle@suse.com
+
+- Don't call autogen.sh on post-12.1 SUSE and post-14 Fedora systems.
+- Recompile all IDL in any case.
+
+-------------------------------------------------------------------
+Fri Jun  1 14:18:58 UTC 2012 - lmuelle@suse.com
+
+- BuildIgnore libtalloc and libtdb to prevent a package conflict on Fedora
+  systems.
+
+-------------------------------------------------------------------
+Thu May 31 15:48:11 UTC 2012 - lmuelle@suse.com
+
+- Install talloc.pc only on pre-12.2 and non SUSE systems.
+
+-------------------------------------------------------------------
+Thu May 31 14:07:36 UTC 2012 - lmuelle@suse.com
+
+- BuildRequire libldb-devel, libtalloc-devel, libtdb-devel, and
+  libtevent-devel on post-12.1 systems.
+
+-------------------------------------------------------------------
+Wed May 30 12:07:39 UTC 2012 - lmuelle@suse.com
+
+- s3: Fix a segfault with debug level 3 on Solaris; (bso#8861).
+- s3: wbinfo --lookup-sids "" crashes winbind; (bso#8904).
+- smbd crashes when deleting directory and veto files are enabled; (bso#8837).
+- winbind_krb5_locator only returns one IP address; (bso#8897).
+- Wrong assertion/comparison: Compare value not pointer; (bso#8859).
+- Inconsistent (with manpage) command-line switch for "help" in smbtree;
+  (bso#8831).
+- Fix incorrect debug statement.
+- Setting traverse rights fails to enable directory traversal when acl_xattr
+  in use; (bso#8857).
+- Syslog broken owing to mistyping of debug_settings.syslog; (bso#8877).
+- s3/ldap: remove outdated netscape ds 5 schema file; (bso#8869).
+- s3-docs: fixes several typos; (bso#7938).
+- s3-VFS: Fix building out-of-tree modules; (bso#8822).
+- s3-docs: Add hint that setting "profile acls = yes" on normal shares can
+  cause trouble; (bso#7930).
+- s3-pam_winbind: Fix the build with a newer iniparser library; (bso#8915).
+- Avoid null dereference in initialize_password_db(); (bso#8920).
+- s3:registry: implement values_need_update and subkeys_need_update in the
+  smbconf backend.
+- s3:registry:reg_api: fix reg_queryvalue to not fail when values are
+  modified while it runs.
+- s4:torture:rpc:spoolss: also initialize driverName before checking it in
+  test_PrinterData_DsSpooler().
+- s3:registry: multiple cleanups, fixes, and optimisations.
+- s3:auth/server_info: the primary rid should be in the groups rid array;
+  (bso#8798).
+- s3-printing: Add new printers to registry; (bso#8554); (baso#8612);
+  (bso#8748).
+- Fix the overwriting of errno before use in a DEBUG statement and use the
+  return value from store_acl_blob_fsp rather than ignoring it; (bso#8945).
+- s3-auth: Don't lookup the system user in pdb; (bso#8944).
+- s3-passdb: Fix negative SID->uid/gid cache handling; (bso#8952).
+- Fix typo in pam_winbindd code; (bso#8957).
+- Fix remove_duplicate_addrs2 previously it could leave zero addresses in the
+  list; (bso#8910).
+- Slow but responsive DC can lock up winbindd; (bso#8943).
+- Broken processing of %U with vfs_full_audit when force user is set;
+  (bso#8882).
+
+-------------------------------------------------------------------
+Mon May 15 11:54:41 UTC 2012 - lmuelle@suse.com
+
+- Disable included build of ldb, talloc, tdb, and tevent on post-12.1 systems.
+- BuildRequire libldb1-devel, libtalloc2-devel, libtdb1-devel, and
+  libtevent0-devel on post-12.1 systems.
+
+-------------------------------------------------------------------
+Wed May  2 13:17:54 UTC 2012 - lmuelle@suse.com
+
+- Add PreReq /etc/init.d/nscd to the winbind package; (bnc#759731).
+
 -------------------------------------------------------------------
 Sat Apr 21 20:59:53 UTC 2012 - lmuelle@suse.com
 
 - docs-xml: fix default name resolve order; (bso#7564).
 - s3-aio-fork: Fix a segfault in vfs_aio_fork; (bso#8836).
 - docs: remove whitespace in example samba.ldif; (bso#8789).
-- s3-smbd: move print_backend_init() behind init_system_info(); (bso#8845).
+- s3-smbd: move print_backend_init() behind init_system_info(); (bso#8845);
+  (bnc#730769).
 - s3-docs: Prepend '/' to filename argument; (bso#8826).
 
 -------------------------------------------------------------------
diff --git a/samba.spec b/samba.spec
index 96e0840..b58711c 100644
--- a/samba.spec
+++ b/samba.spec
@@ -82,23 +82,33 @@ BuildRequires:  pkg-config
 %else
 BuildRequires:  pkgconfig
 %endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
+BuildRequires:  libldb-devel
+#!BuildIgnore: libtalloc
+BuildRequires:  libtalloc-devel
+#!BuildIgnore: libtdb
+BuildRequires:  libtdb-devel
+BuildRequires:  libtevent-devel
+%endif
 %define	samba_ver 3.6.5
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
 %define	guards_symbols pre_1111
 %endif
-%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130
+%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
 %define	libldb_ver 1.0.2
 %define	libtalloc_ver 2.0.5
 %define	libtdb_ver 1.2.9
 %define	libtevent_ver 0.9.11
 %else
+%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131
 %define	libldb_ver %{version}
 %define	libtalloc_ver %{version}
 %define	libtdb_ver %{version}
 %define	libtevent_ver %{version}
 %endif
+%endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 %define	build_make_smp_mflags %{?_smp_mflags}
 %else
@@ -211,7 +221,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package client
@@ -252,7 +262,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -272,7 +282,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -297,7 +307,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -319,7 +329,7 @@ Requires:       samba-client >= %{version}
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if %{make_utils}
@@ -335,7 +345,7 @@ Obsoletes:      samba-gplv3-utils < %{version}
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -356,6 +366,7 @@ Recommends:     cron
 Recommends:     logrotate
 Recommends:     samba-krb-printing
 %endif
+PreReq:         /etc/init.d/nscd
 %if 0%{?suse_version} > 0
 PreReq:         %{?insserv_prereq}
 %endif
@@ -367,7 +378,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -393,14 +404,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -439,7 +450,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libnetapi0
@@ -452,7 +463,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libnetapi-devel
@@ -471,7 +482,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -492,14 +503,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -525,7 +536,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libwbclient0
@@ -538,7 +549,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libwbclient-devel
@@ -557,9 +568,11 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
+
 %package -n libtalloc2
 Version:        %{libtalloc_ver}
 Release:        5
@@ -572,7 +585,7 @@ PreReq:         /sbin/ldconfig
 This package includes the talloc library.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtalloc-devel
@@ -593,7 +606,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtdb1
@@ -608,7 +621,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtdb-devel
@@ -625,7 +638,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtevent0
@@ -640,7 +653,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtevent-devel
@@ -662,7 +675,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libldb1
@@ -678,7 +691,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libldb-devel
@@ -699,10 +712,11 @@ Requires:       libtalloc-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
-
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
+%endif
+
 %if %{make_ldapsmb}
 
 %package -n ldapsmb
@@ -718,7 +732,7 @@ This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
 
-Source Timestamp: 2798
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -726,7 +740,7 @@ Branch      : 3.6.5.PTF
 %prep
 %setup -n samba-%{samba_ver_full} -q
 # check if our library versions from the spec are still current
-%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130
+%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
 grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \
 	exit 1
 grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \
@@ -819,11 +833,9 @@ pushd source3
 %if 0%{?suse_version} && 0%{?suse_version} < 1141
 %{?suse_update_config:%{suse_update_config -f}}
 %endif
-#ln -s m4/aclocal.m4 aclocal.m4
-#autoreconf --force --install -I. -Im4 -I../lib/replace
-%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
 # Ensure all idl is recompiled, in case we are carrying pidl changes locally.
 rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho]
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
 ./autogen.sh
 %endif
 CONFIGURE_OPTIONS="\
@@ -889,6 +901,8 @@ popd
 %endif
 popd
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
+
 for lib_dir in tdb talloc; do
 pushd lib/${lib_dir}
 ./configure \
@@ -927,12 +941,16 @@ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include
 make
 popd
 
+%endif
+
 %check
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
 for lib_dir in tdb talloc tevent; do
 pushd lib/${lib_dir}
 make test
 popd
 done
+%endif
 pushd source3
 make test_shlibs
 make test_nss_modules
@@ -976,6 +994,9 @@ install -d -m 0755 -p \
 	%{buildroot}/%{DOCBOOKDIR} \
 	%{buildroot}/%{SWATDIR}/help \
 	%{buildroot}/%{_datadir}/susehelp/meta/Administration/System
+
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
+
 for lib_dir in tdb talloc tevent; do
 pushd lib/${lib_dir}
 make install \
@@ -988,14 +1009,21 @@ make -C source4/lib/ldb/ install \
 	CONFIGDIR=%{CONFIGDIR} 
 # we prefer the s3 binaries of the tdbtools
 rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool}
+
+%endif
+
 make -C source3/ install \
 	DESTDIR=%{buildroot} \
 	CONFIGDIR=%{CONFIGDIR}
+
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
+
 # libtalloc
 #rm %{buildroot}/%{_libdir}/*talloc*
 make -C lib/talloc/ install \
 	DESTDIR=%{buildroot} \
 	CONFIGDIR=%{CONFIGDIR}
+install -m 0644 source3/pkgconfig/talloc.pc %{buildroot}/%{_libdir}/pkgconfig
 # libtevent
 make -C lib/talloc/ install \
 	DESTDIR=%{buildroot} \
@@ -1003,7 +1031,10 @@ make -C lib/talloc/ install \
 rm -r %{buildroot}/%{python_sitearch} \
 	%{buildroot}/%{_libdir}/ldb/lib{t*,p*} \
 	%{buildroot}/%{_libdir}/tevent
-for file in source3/pkgconfig/*.pc; do
+
+%endif
+
+for file in source3/pkgconfig/{netapi,smbclient,smbsharemodes,wbclient}.pc; do
 	install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig
 done
 # utility scripts
@@ -1298,14 +1329,20 @@ fi
 
 %postun -n libnetapi0 -p /sbin/ldconfig
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
+
 %post -n libtalloc2 -p /sbin/ldconfig
 
 %postun -n libtalloc2 -p /sbin/ldconfig
 
+%endif
+
 %post -n libwbclient0 -p /sbin/ldconfig
 
 %postun -n libwbclient0 -p /sbin/ldconfig
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
+
 %post -n libtdb1 -p /sbin/ldconfig
 
 %postun -n libtdb1 -p /sbin/ldconfig
@@ -1317,6 +1354,9 @@ fi
 %post -n libldb1 -p /sbin/ldconfig
 
 %postun -n libldb1 -p /sbin/ldconfig
+
+%endif
+
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
 
 %pre doc
@@ -1535,12 +1575,6 @@ fi
 %endif
 %{_bindir}/eventlogadm
 %{_bindir}/findsmb
-%{_bindir}/ldbadd
-%{_bindir}/ldbdel
-%{_bindir}/ldbedit
-%{_bindir}/ldbmodify
-%{_bindir}/ldbrename
-%{_bindir}/ldbsearch
 %{_bindir}/net
 %{_bindir}/nmblookup
 %{_bindir}/nmbstatus
@@ -1559,11 +1593,19 @@ fi
 %{_bindir}/smbspool
 %{_bindir}/smbtar
 %{_bindir}/smbtree
+%{_bindir}/testparm
+%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
+%{_bindir}/ldbadd
+%{_bindir}/ldbdel
+%{_bindir}/ldbedit
+%{_bindir}/ldbmodify
+%{_bindir}/ldbrename
+%{_bindir}/ldbsearch
 %{_bindir}/tdbbackup
 %{_bindir}/tdbdump
 %{_bindir}/tdbrestore
 %{_bindir}/tdbtool
-%{_bindir}/testparm
+%endif
 %{_sbindir}/rc%{cifs_init_script}
 /%{_lib}/libnss_wins.so.2
 %dir %{cups_lib_dir}
@@ -1745,6 +1787,8 @@ fi
 %{_libdir}/libsmbsharemodes.so
 %{_libdir}/pkgconfig/smbsharemodes.pc
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
+
 %files -n libtalloc2
 %defattr(-,root,root)
 %{_libdir}/libpytalloc-util.so.*
@@ -1775,6 +1819,8 @@ fi
 %{_libdir}/libtdb.so
 %{_libdir}/pkgconfig/tdb.pc
 
+%endif
+
 %files -n libwbclient0
 %defattr(-,root,root)
 %{_libdir}/libwbclient.so.*
@@ -1787,6 +1833,8 @@ fi
 %{_libdir}/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1211
+
 %files -n libtevent0
 %defattr(-,root,root)
 %{_libdir}/libtevent.so.*
@@ -1812,6 +1860,9 @@ fi
 %{_libdir}/libpyldb-util.so
 %{_libdir}/pkgconfig/ldb.pc
 %{_libdir}/pkgconfig/pyldb-util.pc
+
+%endif
+
 %if %{make_ldapsmb}
 
 %files -n ldapsmb
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index cdd7b36..8fd7131 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:94f5c263bc2a4d549a03c7cc638e785847d2a7877fc6370183de61881d6ca0a1
-size 52524
+oid sha256:e576b416ef26c24de6c601ed89928458973b5421671553dad684a0e8f85ba014
+size 52554