diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 9998b84..fe004c7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b502c89a292a052ab9d03668a4cc729fb18dc540745fa221dc87f55c1f2bcb5 -size 32580 +oid sha256:b5cf583a1c40119d837202627f5677729ee8b53ab910235e2488cb3f9a4e122e +size 33182 diff --git a/samba-doc.spec b/samba-doc.spec index f9d561b..8af5b0d 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2934 +%define SOURCE_TIMESTAMP 2942 %define BRANCH %{version} Version: 3.6.12 Release: 0 diff --git a/samba.changes b/samba.changes index bb17efd..8a87ba9 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Feb 8 21:06:56 UTC 2013 - lmuelle@suse.com + +- Point LD_LIBRARY_PATH to the just built libraries while calling testparm to + generate the default share snippets on pre-12.2 systems. + +------------------------------------------------------------------- +Thu Feb 7 15:30:36 UTC 2013 - ddiss@suse.com + +- Fix smbclient recursive mget EPERM handling; (bso#9633); (bnc#786350). + ------------------------------------------------------------------- Wed Feb 6 14:24:40 UTC 2013 - sjayaraman@suse.de diff --git a/samba.spec b/samba.spec index ca9d03c..e99889a 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2934 +%define SOURCE_TIMESTAMP 2942 %define BRANCH %{version} Version: 3.6.12 Release: 0 @@ -976,6 +976,9 @@ done %endif section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf) for section in $section_names; do +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 + LD_LIBRARY_PATH=../source3/bin/ \ +%endif ../source3/bin/testparm -s --section-name "${section}" config/smb.conf >"%{buildroot}/%{_datadir}/samba/templates/default-${section}" || : done for file in config/templates/*; do diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 20cbeda..ee9cb4f 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:588fc4ab47c8d2406495ea10a55b1075c4e683158104f61dff17f97d0380678c -size 53484 +oid sha256:ad7cb1d1e1a589f7e393bef0c0e314f7f3d4af01646ad86c3fd4882db5afb450 +size 53393