diff --git a/build-source-timestamp b/build-source-timestamp index 1775df1..c81e7c3 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2472 +2480 Branch : 3.5.6 diff --git a/samba-doc.spec b/samba-doc.spec index 1ad18c6..a193880 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -1,7 +1,7 @@ # # spec file for package samba-doc (Version 3.5.6) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,7 +66,7 @@ BuildRequires: pkgconfig %endif Url: http://www.samba.org/ Version: 3.5.6 -Release: 2 +Release: 3 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -396,7 +396,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index 5e25ee7..04b57f4 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jan 4 16:26:37 UTC 2011 - lmuelle@suse.de + +- Recommend to install samba-krb-rinting from samba-winbind on post-10.3 + systems; (bnc#661845). + +------------------------------------------------------------------- +Mon Dec 13 00:54:03 CET 2010 - ro@suse.de + +- Don't tweak with baselibs.conf during %post if not present; (bnc#652620). + +------------------------------------------------------------------- +Thu Dec 9 13:31:15 UTC 2010 - lmuelle@suse.de + +- Don't make use of baselibs.conf on SUSE Linux Enterprise 10; (bnc#652620). + +------------------------------------------------------------------- +Tue Dec 7 16:48:25 UTC 2010 - lmuelle@suse.de + +- Don't use --tmpdir as this option isn't known by mktemp of SUSE Linux + Enterprise 10; (bnc#652620). + ------------------------------------------------------------------- Sun Dec 5 22:28:35 UTC 2010 - lars@samba.org diff --git a/samba.spec b/samba.spec index b3e0eda..1209b1c 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # # spec file for package samba (Version 3.5.6) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -71,7 +71,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.6 -Release: 2 +Release: 3 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -173,7 +173,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package client @@ -219,7 +219,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -246,7 +246,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %endif @@ -276,7 +276,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %endif @@ -303,7 +303,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %if %{make_utils} @@ -340,7 +340,7 @@ Obsoletes: samba-winbind-64bit %endif Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 -Recommends: cron logrotate +Recommends: cron logrotate samba-krb-printing %endif PreReq: coreutils /sbin/ldconfig %{?insserv_prereq} /usr/sbin/groupadd @@ -353,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -379,7 +379,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %else @@ -424,7 +424,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libnetapi0 @@ -443,7 +443,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libnetapi-devel @@ -463,7 +463,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -484,7 +484,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %else @@ -520,7 +520,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libtalloc2 @@ -539,7 +539,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libtalloc-devel @@ -559,7 +559,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libtdb1 @@ -578,7 +578,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libtdb-devel @@ -598,7 +598,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libwbclient0 @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libwbclient-devel @@ -637,7 +637,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libtevent0 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libtevent-devel @@ -677,7 +677,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libldb0 @@ -697,7 +697,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %package -n libldb-devel @@ -717,7 +717,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %if %{make_ldapsmb} @@ -728,7 +728,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 294 +Release: 295 Requires: perl-ldap %description -n ldapsmb @@ -741,7 +741,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %endif @@ -764,7 +764,7 @@ Authors: -------- Steve French -Source Timestamp: 2472 +Source Timestamp: 2480 Branch : 3.5.6 %endif @@ -1522,9 +1522,9 @@ exit 0 %clean [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" -%if 0%{?suse_version} < 1110 +if [ -e ${RPM_SOURCE_DIR}/baselibs.conf -a 0%{?suse_version} -gt 0 -a 0%{?suse_version} -lt 1110 ]; then sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf -%endif +fi %files -f filelist-samba %defattr(-,root,root) diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index db27fb6..5461abf 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:945a9558f39d87baf548862a8f31f4c4ee45c65e2db84e075f7c0cd58df3f302 -size 24559 +oid sha256:0bb58f879e03ba7a1063cf76f968294dd6f0b3d2697e387089fce46acd52090d +size 24572