Hello community,
here is the log from the commit of package samba for openSUSE:11.4
checked in at Sun Feb 27 13:16:46 CET 2011.
--------
--- old-versions/11.4/all/samba/samba.changes 2011-02-17 17:24:02.000000000 +0100
+++ 11.4/samba/samba.changes 2011-02-23 17:10:21.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Feb 23 11:20:14 UTC 2011 - lmuelle@suse.de
+
+- Disable separate build of samba-doc for post-11.1 systems.
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.sVf4VO/_old 2011-02-27 13:16:12.000000000 +0100
+++ /var/tmp/diff_new_pack.sVf4VO/_new 2011-02-27 13:16:12.000000000 +0100
@@ -77,7 +77,7 @@
%endif
Url: http://www.samba.org/
Version: 3.5.6
-Release: 6.<RELEASE2>
+Release: 6.<RELEASE3>
License: GPLv3+
Summary: Samba Documentation
Group: Documentation/Other
@@ -296,6 +296,8 @@
./script/mkversion.sh
%install
+# samba-doc nowadays is part the main samba spec file
+%if 0%{?suse_version} && 0%{?suse_version} < 1111
mkdir -p \
${RPM_BUILD_ROOT}/%{DOCDIR} \
${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \
@@ -372,6 +374,7 @@
${RPM_BUILD_ROOT}/%{_mandir}/man1/log2pcap.1* \
${RPM_BUILD_ROOT}/%{_mandir}/man1/vfstest.1*
%endif
+%endif
%pre
# Remove all directories and files from usr/share/samba/swat/help expect welcome-*.html
@@ -389,6 +392,9 @@
%clean
[ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}"
+# samba-doc nowadays is part the main samba spec file
+%if 0%{?suse_version} && 0%{?suse_version} < 1111
+
%files -f filelist-samba-doc
%defattr(-,root,root)
%dir %{DOCDIR}
@@ -396,6 +402,7 @@
%dir %{SWATDIR}
%dir %{SWATDIR}/help
%doc %{_datadir}/susehelp
+%endif
%description
This package contains all the Samba documentation as it is not part of
@@ -407,7 +414,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%changelog
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.sVf4VO/_old 2011-02-27 13:16:12.000000000 +0100
+++ /var/tmp/diff_new_pack.sVf4VO/_new 2011-02-27 13:16:12.000000000 +0100
@@ -82,7 +82,7 @@
Url: http://www.samba.org/
AutoReqProv: on
Version: 3.5.6
-Release: 6.<RELEASE2>
+Release: 6.<RELEASE3>
Provides: samba-gplv3 = %{version}-%{release}
Obsoletes: samba-gplv3 < %{version}
%ifarch ppc64
@@ -184,7 +184,7 @@
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package client
@@ -230,7 +230,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -257,7 +257,7 @@
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%endif
@@ -287,7 +287,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%endif
@@ -314,7 +314,7 @@
--------
Jeremy Allison <jra at samba dot org>
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%if %{make_utils}
@@ -365,7 +365,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -390,7 +390,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%else
@@ -435,7 +435,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libnetapi0
@@ -454,7 +454,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libnetapi-devel
@@ -474,7 +474,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -494,7 +494,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%else
@@ -530,7 +530,7 @@
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libtalloc2
@@ -539,7 +539,7 @@
Group: System/Libraries
AutoReqProv: on
Version: %{libtalloc_ver}
-Release: 2.<RELEASE2>
+Release: 2.<RELEASE3>
PreReq: /sbin/ldconfig
%description -n libtalloc2
@@ -551,7 +551,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libtalloc-devel
@@ -560,7 +560,7 @@
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: %{libtalloc_ver}
-Release: 2.<RELEASE2>
+Release: 2.<RELEASE3>
Requires: libtalloc2
%description -n libtalloc-devel
@@ -573,7 +573,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libtdb1
@@ -582,7 +582,7 @@
Group: System/Libraries
AutoReqProv: on
Version: %{libtdb_ver}
-Release: 2.<RELEASE2>
+Release: 2.<RELEASE3>
PreReq: /sbin/ldconfig
%description -n libtdb1
@@ -594,7 +594,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libtdb-devel
@@ -603,7 +603,7 @@
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: %{libtdb_ver}
-Release: 2.<RELEASE2>
+Release: 2.<RELEASE3>
Requires: libtdb1
%description -n libtdb-devel
@@ -616,7 +616,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libwbclient0
@@ -635,7 +635,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libwbclient-devel
@@ -655,7 +655,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libtevent0
@@ -664,7 +664,7 @@
Group: System/Libraries
AutoReqProv: on
Version: %{libtevent_ver}
-Release: 2.<RELEASE2>
+Release: 2.<RELEASE3>
PreReq: /sbin/ldconfig
%description -n libtevent0
@@ -676,7 +676,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libtevent-devel
@@ -685,7 +685,7 @@
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: %{libtevent_ver}
-Release: 2.<RELEASE2>
+Release: 2.<RELEASE3>
Requires: libtevent0
%description -n libtevent-devel
@@ -699,7 +699,7 @@
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libldb0
@@ -708,7 +708,7 @@
Group: System/Libraries
AutoReqProv: on
Version: %{libldb_ver}
-Release: 2.<RELEASE2>
+Release: 2.<RELEASE3>
PreReq: /sbin/ldconfig
%description -n libldb0
@@ -721,7 +721,7 @@
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%package -n libldb-devel
@@ -730,7 +730,7 @@
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: %{libldb_ver}
-Release: 2.<RELEASE2>
+Release: 2.<RELEASE3>
Requires: libldb0
%description -n libldb-devel
@@ -743,7 +743,7 @@
--------
The Samba Team
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%if %{make_ldapsmb}
@@ -754,7 +754,7 @@
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 1.34b
-Release: 298.<RELEASE2>
+Release: 298.<RELEASE3>
Requires: perl-ldap
%description -n ldapsmb
@@ -767,7 +767,7 @@
--------
Guenther Deschner <guenther at deschner dot de>
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%endif
@@ -790,7 +790,7 @@
--------
Steve French <sfrench at Samba dot org>
-Source Timestamp: 2497
+Source Timestamp: 2501
Branch : 3.5.6
%endif
++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.sVf4VO/_old 2011-02-27 13:16:12.000000000 +0100
+++ /var/tmp/diff_new_pack.sVf4VO/_new 2011-02-27 13:16:12.000000000 +0100
@@ -1,2 +1,2 @@
-2497
+2501
Branch : 3.5.6
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/async_printcap_svc_update.diff new/patches/suse/async_printcap_svc_update.diff
--- old/patches/suse/async_printcap_svc_update.diff 2011-01-14 15:18:41.000000000 +0100
+++ new/patches/suse/async_printcap_svc_update.diff 2011-02-21 23:34:24.000000000 +0100
@@ -138,7 +138,7 @@
===================================================================
--- source3/smbd/server.c.orig
+++ source3/smbd/server.c
-@@ -734,9 +734,9 @@ static void smbd_parent_loop(struct smbd
+@@ -735,9 +735,9 @@ static void smbd_parent_loop(struct smbd
/* NOTREACHED return True; */
}
@@ -151,7 +151,7 @@
void reload_printers(void)
{
int snum;
-@@ -744,9 +744,9 @@ void reload_printers(void)
+@@ -745,9 +745,9 @@ void reload_printers(void)
int pnum = lp_servicenumber(PRINTERS_NAME);
const char *pname;
@@ -163,7 +163,7 @@
for (snum = 0; snum < n_services; snum++) {
/* avoid removing PRINTERS_NAME or non-autoloaded printers */
if (snum == pnum || !(lp_snum_ok(snum) && lp_print_ok(snum) &&
-@@ -793,7 +793,7 @@ bool reload_services(bool test)
+@@ -794,7 +794,7 @@ bool reload_services(bool test)
ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/printcap_cache_time_abide.diff new/patches/suse/printcap_cache_time_abide.diff
--- old/patches/suse/printcap_cache_time_abide.diff 2011-01-14 15:18:41.000000000 +0100
+++ new/patches/suse/printcap_cache_time_abide.diff 2011-02-21 23:34:28.000000000 +0100
@@ -20,7 +20,7 @@
===================================================================
--- source3/smbd/server.c.orig
+++ source3/smbd/server.c
-@@ -541,6 +541,14 @@ static bool smbd_open_one_socket(struct
+@@ -542,6 +542,14 @@ static bool smbd_open_one_socket(struct
return true;
}
@@ -35,7 +35,7 @@
/****************************************************************************
Open the socket communication.
****************************************************************************/
-@@ -668,6 +676,14 @@ static bool open_sockets_smbd(struct smb
+@@ -669,6 +677,14 @@ static bool open_sockets_smbd(struct smb
claim_connection(NULL,"",
FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_DBWRAP);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/remove_pcap_cache_loaded_asserts.diff new/patches/suse/remove_pcap_cache_loaded_asserts.diff
--- old/patches/suse/remove_pcap_cache_loaded_asserts.diff 2011-01-18 15:40:33.000000000 +0100
+++ new/patches/suse/remove_pcap_cache_loaded_asserts.diff 2011-02-21 23:34:33.000000000 +0100
@@ -15,7 +15,7 @@
===================================================================
--- source3/smbd/server.c.orig
+++ source3/smbd/server.c
-@@ -760,8 +760,6 @@ void reload_printers(void)
+@@ -761,8 +761,6 @@ void reload_printers(void)
int pnum = lp_servicenumber(PRINTERS_NAME);
const char *pname;
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2011-02-17 17:17:54.000000000 +0100
+++ new/vendor-files/tools/package-data 2011-02-23 16:53:24.000000000 +0100
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2497"
+SAMBA_PACKAGE_SVN_VERSION="2501M"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org