From 5fad29d9402f4eec83f7748eee091adfe3df6411ecc061b4dc42c63ad374d7fd Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 23 Nov 2009 10:16:32 +0000 Subject: [PATCH] Accepting request 24803 from network:samba:STABLE Copy from network:samba:STABLE/samba based on submit request 24803 from user lmuelle OBS-URL: https://build.opensuse.org/request/show/24803 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=50 --- build-source-timestamp | 2 +- samba-doc.spec | 9 ++-- samba.changes | 21 +++++++++ samba.spec | 102 ++++++++++++++++++++++------------------- vendor-files.tar.bz2 | 4 +- 5 files changed, 86 insertions(+), 52 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 15993e2..e6fdce3 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2231 +2240 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index fdd3ade..5b3b26d 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -47,6 +47,9 @@ BuildRequires: keyutils-devel %if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: ctdb-devel %endif +%if 0%{?suse_version} > 1110 +BuildRequires: fdupes +%endif %define samba_ver 3.4.3 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} @@ -55,7 +58,7 @@ BuildRequires: ctdb-devel %endif Url: http://www.samba.org/ Version: 3.4.3 -Release: 1 +Release: 2 License: GPL v3 or later Summary: Samba Documentation Group: Documentation/Other @@ -361,10 +364,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index d65209c..1bb5672 100644 --- a/samba.changes +++ b/samba.changes @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Fri Nov 6 19:55:27 CET 2009 - lmuelle@suse.de + +- Hardlink duplicate files on post-11.1 systems. + +------------------------------------------------------------------- +Fri Nov 6 18:08:17 CET 2009 - lmuelle@suse.de + +- Add BuildArch noarch to samba-doc on post-11.1 systems. + +------------------------------------------------------------------- +Tue Nov 3 03:10:47 CET 2009 - boyang@suse.de + +- Use full 16byte session key in make_user_info_netlogon_interactive(); + (bnc#551811). + +------------------------------------------------------------------ Thu Oct 29 14:22:08 CET 2009 - lmuelle@suse.de - Update to 3.4.3. @@ -63,6 +79,11 @@ Fri Oct 23 05:07:37 CEST 2009 - boyang@suse.de - Don't fail authentication when one or some group of require-membership-of is invalid; (bnc#525123); (bso#6826). +------------------------------------------------------------------ +Fri Oct 16 10:31:53 CEST 2009 - jmcdonough@suse.de + +- Allow winbind to ignore certain domains; (bnc#539506). + ------------------------------------------------------------------ Thu Oct 8 21:54:16 CEST 2009 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 016e7f5..97f075f 100644 --- a/samba.spec +++ b/samba.spec @@ -47,6 +47,9 @@ BuildRequires: keyutils-devel %if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: ctdb-devel %endif +%if 0%{?suse_version} > 1110 +BuildRequires: fdupes +%endif %define samba_ver 3.4.3 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} @@ -60,7 +63,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.4.3 -Release: 1 +Release: 2 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -149,10 +152,10 @@ Authors: The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package client @@ -192,10 +195,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -220,14 +223,14 @@ Authors: The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %endif -%if 0%{?suse_version} && 0%{?suse_version} < 1001 +%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc License: GPL v3 or later @@ -237,6 +240,9 @@ AutoReqProv: on Provides: samba3-doc = %{version}-%{release} Obsoletes: samba3-doc < %{version} PreReq: coreutils findutils +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif %description doc This package contains all the Samba documentation as it is not part of @@ -248,10 +254,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %endif @@ -278,10 +284,10 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %if %{make_utils} @@ -330,10 +336,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -357,10 +363,10 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %else @@ -402,10 +408,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package -n libnetapi0 @@ -424,10 +430,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package -n libnetapi-devel @@ -447,10 +453,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -469,10 +475,10 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %else @@ -506,10 +512,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %if %{make_ldapsmb} @@ -530,10 +536,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package -n libtalloc-devel @@ -553,10 +559,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package -n libtdb1 @@ -575,10 +581,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package -n libtdb-devel @@ -598,10 +604,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package -n libwbclient0 @@ -620,10 +626,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package -n libwbclient-devel @@ -643,10 +649,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %package -n ldapsmb @@ -655,7 +661,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 271 +Release: 272 Requires: perl-ldap %description -n ldapsmb @@ -668,10 +674,10 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %endif @@ -694,10 +700,10 @@ Authors: -------- Steve French -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk -Source Timestamp: 2231 +Source Timestamp: 2240 Branch : trunk %endif @@ -1160,7 +1166,7 @@ done %__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema %__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema # Clean up installed doc if we have a noarch doc package -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 && 0%{?suse_version} < 1120 while read file; do rm -r "${RPM_BUILD_ROOT}/${file#%* }" done <"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" @@ -1180,6 +1186,10 @@ mv ${RPM_BUILD_ROOT}/sbin/{,u}mount.cifs ${RPM_BUILD_ROOT}/usr/sbin/ ln -fs /usr/sbin/mount.cifs ${RPM_BUILD_ROOT}/sbin/ ln -fs /usr/sbin/umount.cifs ${RPM_BUILD_ROOT}/sbin/ %endif +# Hardlink duplicate files +%if 0%{?suse_version} > 1110 +%fdupes ${RPM_BUILD_ROOT} +%endif %pre /usr/sbin/groupadd -g 71 -o -r ntadmin 2>/dev/null || : @@ -1247,7 +1257,7 @@ fi %postun -n libtdb1 /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1001 +%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %pre doc # Remove all directories and files from usr/share/samba/swat/help expect welcome-*.html @@ -1614,7 +1624,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf %doc %{_mandir}/man1/log2pcap.1.* %doc %{_mandir}/man1/vfstest.1.* %endif -%if 0%{?suse_version} && 0%{?suse_version} < 1001 +%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %files doc -f filelist-samba-doc %defattr(-,root,root) diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 39fa0a0..a3b32f7 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:ddf2633746e5eb86d975f27d5c5570930debc8ee2f4a205eb9b1dba3f5ef56d7 -size 24099 +oid sha256:a692e0d750eb0631c7dc1cd74a25eff0d8b1ae096f383c9eda441eaf59386ad6 +size 24058