Hello community,
here is the log from the commit of package samba for openSUSE:Factory
checked in at Sat Feb 12 12:18:07 CET 2011.
--------
--- samba/samba.changes 2011-02-05 14:43:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/samba/samba.changes 2011-02-10 18:47:34.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Feb 10 17:09:42 UTC 2011 - lmuelle@suse.de
+
+- Do not require a particular library version if the major version is part of
+ the package name.
+
+-------------------------------------------------------------------
+Wed Feb 9 23:14:03 UTC 2011 - lmuelle@suse.de
+
+- Use the actual version numbers of the ldb, talloc, tdb, and tevent libraries
+ on post-11.3 systems.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.9lAVxk/_old 2011-02-12 12:17:44.000000000 +0100
+++ /var/tmp/diff_new_pack.9lAVxk/_new 2011-02-12 12:17:44.000000000 +0100
@@ -64,9 +64,20 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111
%endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130
+%define libldb_ver 0.9.7
+%define libtalloc_ver 2.0.1
+%define libtdb_ver 1.2.1
+%define libtevent_ver 0.9.8
+%else
+%define libldb_ver %{version}
+%define libtalloc_ver %{version}
+%define libtdb_ver %{version}
+%define libtevent_ver %{version}
+%endif
Url: http://www.samba.org/
Version: 3.5.6
-Release: 4
+Release: 5
License: GPLv3+
Summary: Samba Documentation
Group: Documentation/Other
@@ -396,7 +407,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%changelog
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.9lAVxk/_old 2011-02-12 12:17:44.000000000 +0100
+++ /var/tmp/diff_new_pack.9lAVxk/_new 2011-02-12 12:17:44.000000000 +0100
@@ -64,6 +64,17 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111
%endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130
+%define libldb_ver 0.9.7
+%define libtalloc_ver 2.0.1
+%define libtdb_ver 1.2.1
+%define libtevent_ver 0.9.8
+%else
+%define libldb_ver %{version}
+%define libtalloc_ver %{version}
+%define libtdb_ver %{version}
+%define libtevent_ver %{version}
+%endif
%define vscan_ver 0.3.6b
%define ldapsmb_ver 1.34b
License: GPLv3+
@@ -71,7 +82,7 @@
Url: http://www.samba.org/
AutoReqProv: on
Version: 3.5.6
-Release: 4
+Release: 5
Provides: samba-gplv3 = %{version}-%{release}
Obsoletes: samba-gplv3 < %{version}
%ifarch ppc64
@@ -173,7 +184,7 @@
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package client
@@ -219,7 +230,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -246,7 +257,7 @@
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%endif
@@ -276,7 +287,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%endif
@@ -303,7 +314,7 @@
--------
Jeremy Allison <jra at samba dot org>
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%if %{make_utils}
@@ -354,7 +365,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -379,7 +390,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%else
@@ -405,12 +416,12 @@
Group: Development/Libraries/C and C++
AutoReqProv: on
%if 0%{?suse_version} && 0%{?suse_version} < 921
-Requires: libsmbclient = %{version} heimdal-devel
+Requires: libsmbclient heimdal-devel
%else
%if 0%{?suse_version} && 0%{?suse_version} < 1031
-Requires: libsmbclient = %{version} krb5-devel
+Requires: libsmbclient krb5-devel
%else
-Requires: libsmbclient0 = %{version} krb5-devel
+Requires: libsmbclient0 krb5-devel
%endif
%endif
@@ -424,7 +435,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libnetapi0
@@ -443,7 +454,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libnetapi-devel
@@ -451,7 +462,7 @@
Summary: Libraries and Header Files to Develop Programs with netapi Support
Group: Development/Libraries/C and C++
AutoReqProv: on
-Requires: libnetapi0 = %{version}
+Requires: libnetapi0
%description -n libnetapi-devel
This package contains the static libraries and header files needed to
@@ -463,7 +474,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -483,7 +494,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%else
@@ -503,9 +514,9 @@
Group: Development/Libraries/C and C++
AutoReqProv: on
%if 0%{?suse_version} && 0%{?suse_version} < 1031
-Requires: libsmbsharemodes = %{version}
+Requires: libsmbsharemodes
%else
-Requires: libsmbsharemodes0 = %{version}
+Requires: libsmbsharemodes0
%endif
%description -n libsmbsharemodes-devel
@@ -519,7 +530,7 @@
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libtalloc2
@@ -527,6 +538,8 @@
Summary: Samba talloc Library
Group: System/Libraries
AutoReqProv: on
+Version: %{libtalloc_ver}
+Release: 1
PreReq: /sbin/ldconfig
%description -n libtalloc2
@@ -538,7 +551,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libtalloc-devel
@@ -546,7 +559,9 @@
Summary: Libraries and Header Files to Develop Programs with talloc Support
Group: Development/Libraries/C and C++
AutoReqProv: on
-Requires: libtalloc2 = %{version}
+Version: %{libtalloc_ver}
+Release: 1
+Requires: libtalloc2
%description -n libtalloc-devel
This package contains the static libraries and header files needed to
@@ -558,7 +573,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libtdb1
@@ -566,6 +581,8 @@
Summary: Samba tdb Library
Group: System/Libraries
AutoReqProv: on
+Version: %{libtdb_ver}
+Release: 1
PreReq: /sbin/ldconfig
%description -n libtdb1
@@ -577,7 +594,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libtdb-devel
@@ -585,7 +602,9 @@
Summary: Libraries and Header Files to Develop Programs with tdb Support
Group: Development/Libraries/C and C++
AutoReqProv: on
-Requires: libtdb1 = %{version}
+Version: %{libtdb_ver}
+Release: 1
+Requires: libtdb1
%description -n libtdb-devel
This package contains the static libraries and header files needed to
@@ -597,7 +616,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libwbclient0
@@ -616,7 +635,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libwbclient-devel
@@ -624,7 +643,7 @@
Summary: Libraries and Header Files to Develop Programs with wbclient Support
Group: Development/Libraries/C and C++
AutoReqProv: on
-Requires: libwbclient0 = %{version}
+Requires: libwbclient0
%description -n libwbclient-devel
This package contains the static libraries and header files needed to
@@ -636,7 +655,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libtevent0
@@ -644,6 +663,8 @@
Summary: Samba tevent Library
Group: System/Libraries
AutoReqProv: on
+Version: %{libtevent_ver}
+Release: 1
PreReq: /sbin/ldconfig
%description -n libtevent0
@@ -655,7 +676,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libtevent-devel
@@ -663,7 +684,9 @@
Summary: Libraries and Header Files to Develop Programs with tevent Support
Group: Development/Libraries/C and C++
AutoReqProv: on
-Requires: libtevent0 = %{version}
+Version: %{libtevent_ver}
+Release: 1
+Requires: libtevent0
%description -n libtevent-devel
This package contains the static libraries and header files needed to
@@ -676,7 +699,7 @@
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libldb0
@@ -684,6 +707,8 @@
Summary: Samba ldb Library
Group: System/Libraries
AutoReqProv: on
+Version: %{libldb_ver}
+Release: 1
PreReq: /sbin/ldconfig
%description -n libldb0
@@ -696,7 +721,7 @@
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%package -n libldb-devel
@@ -704,7 +729,9 @@
Summary: Libraries and Header Files to Develop Programs with ldb Support
Group: Development/Libraries/C and C++
AutoReqProv: on
-Requires: libldb0 = %{version}
+Version: %{libldb_ver}
+Release: 1
+Requires: libldb0
%description -n libldb-devel
This package contains the static libraries and header files needed to
@@ -716,7 +743,7 @@
--------
The Samba Team
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%if %{make_ldapsmb}
@@ -727,7 +754,7 @@
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 1.34b
-Release: 296
+Release: 297
Requires: perl-ldap
%description -n ldapsmb
@@ -740,7 +767,7 @@
--------
Guenther Deschner <guenther at deschner dot de>
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%endif
@@ -763,7 +790,7 @@
--------
Steve French <sfrench at Samba dot org>
-Source Timestamp: 2490
+Source Timestamp: 2495
Branch : 3.5.6
%endif
@@ -795,6 +822,17 @@
%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
+grep "^AC_INIT(ldb, %{libldb_ver})$" source4/lib/ldb/configure.ac || \
+ exit 1
+grep "^AC_INIT(talloc, %{libtalloc_ver})$" lib/talloc/configure.ac || \
+ exit 1
+grep "^AC_INIT(tdb, %{libtdb_ver})$" lib/tdb/configure.ac || \
+ exit 1
+grep "^AC_INIT(tevent, %{libtevent_ver})$" lib/tevent/configure.ac || \
+ exit 1
+%endif
# ldapsmb
%if %{make_ldapsmb}
%setup -T -D -a 11 -n samba-%{samba_ver_full} -q
++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.9lAVxk/_old 2011-02-12 12:17:44.000000000 +0100
+++ /var/tmp/diff_new_pack.9lAVxk/_new 2011-02-12 12:17:44.000000000 +0100
@@ -1,2 +1,2 @@
-2490
+2495
Branch : 3.5.6
++++++ 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-05 14:42:14.000000000 +0100
+++ new/vendor-files/tools/package-data 2011-02-10 18:45:33.000000000 +0100
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2490"
+SAMBA_PACKAGE_SVN_VERSION="2495"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org