Shift 'Source timestamp' and 'Branch' line in the spec file back to the

old position.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=269

build-source-timestamp

@@ -1 +1 @@
-SOURCE_TIMESTAMP="2866"
+SOURCE_TIMESTAMP="2868"

patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88e41f7812dae00bd6818788c338388a231b0aae5c856c1b140241f185c3bb2a
+oid sha256:fec8cc60783970758f56fb17a79e726ae41b53f4f82d809b6f50bced1d8452c2
-size 44082
+size 44086

samba-doc.spec

@@ -116,7 +116,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2866
+%define SOURCE_TIMESTAMP 2868
 %define BRANCH 3.6.9
 Version:        3.6.9
 Release:        0
@@ -457,12 +457,12 @@ fi
 %endif
 
 %description
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains all the Samba documentation as it is not part of
 the man pages.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 
 %changelog

samba.spec

@@ -116,7 +116,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2866
+%define SOURCE_TIMESTAMP 2868
 %define BRANCH 3.6.9
 Version:        3.6.9
 Release:        0
@@ -209,9 +209,6 @@ BuildRequires:  ccache
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 Samba is a suite of programs that allows SMB/CIFS clients to use the
 Unix file space, printers, and authentication subsystem.
 
@@ -227,6 +224,9 @@ Samba as part of SUSE Linux Enterprise or openSUSE products, links to
 binary packages of the most current Samba version, and a bug reporting
 how to.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %package client
 License:        GPL-3.0+
@@ -250,9 +250,6 @@ PreReq:         coreutils
 Requires:       cifs-utils
 
 %description client
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 Samba is a suite of programs that allows SMB/CIFS clients to use the
 Unix file space, printers, and authentication subsystem.
 
@@ -268,6 +265,9 @@ Samba as part of SUSE Linux Enterprise or openSUSE products, links to
 binary packages of the most current Samba version, and a bug reporting
 how to.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
 %package devel
@@ -281,12 +281,12 @@ Obsoletes:      samba-devel-64bit
 %endif
 
 %description devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@@ -306,12 +306,12 @@ BuildArch:      noarch
 %endif
 
 %description doc
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains all the Samba documentation as it is not part of
 the man pages.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %endif
 
@@ -328,11 +328,11 @@ PreReq:         permissions
 Requires:       samba-client >= %{version}
 
 %description krb-printing
+A wrapper binary to run smbspool with the original calling UID.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-A wrapper binary to run smbspool with the original calling UID.
-
 
 %if %{make_utils}
 
@@ -343,11 +343,11 @@ Provides:       samba-gplv3-utils = %{version}
 Obsoletes:      samba-gplv3-utils < %{version}
 
 %description utils
+Some of the debug-tools for developpers.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-Some of the debug-tools for developpers.
-
 
 %endif
 
@@ -376,11 +376,11 @@ PreReq:         /usr/sbin/groupadd
 PreReq:         coreutils
 
 %description winbind
+This is the winbind-daemon and the wbinfo-tool.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-This is the winbind-daemon and the wbinfo-tool.
-
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 %package -n libsmbclient
@@ -403,9 +403,6 @@ PreReq:         /sbin/ldconfig
 %else
 %description -n libsmbclient0
 %endif
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package includes the libsmbclient library.
 
 libsmbclient is provided by the libsmbclient0 package.
@@ -414,6 +411,9 @@ This entry is required to allow a samba.spec file providing
 libsmbclient for SUSE version < 11.0 while versions > 10.0 will have
 libsmbclient0.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %package -n libsmbclient-devel
 License:        GPL-3.0+
@@ -438,12 +438,12 @@ Requires:       libsmbclient0 = %{version}
 %endif
 
 %description -n libsmbclient-devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %package -n libnetapi0
 License:        GPL-3.0+
@@ -452,11 +452,11 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libnetapi0
+This package includes the netapi library.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-This package includes the netapi library.
-
 
 %package -n libnetapi-devel
 License:        GPL-3.0+
@@ -470,12 +470,12 @@ BuildRequires:  pkgconfig
 Requires:       libnetapi0 = %{version}
 
 %description -n libnetapi-devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 %package -n libsmbsharemodes
@@ -493,11 +493,11 @@ PreReq:         /sbin/ldconfig
 %else
 %description -n libsmbsharemodes0
 %endif
+This package includes the smbsharemodes library.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-This package includes the smbsharemodes library.
-
 
 %package -n libsmbsharemodes-devel
 License:        GPL-3.0+
@@ -515,12 +515,12 @@ Requires:       libsmbsharemodes0 = %{version}
 %endif
 
 %description -n libsmbsharemodes-devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %package -n libwbclient0
 License:        LGPL-3.0+
@@ -529,11 +529,11 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libwbclient0
+This package includes the wbclient library.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-This package includes the wbclient library.
-
 
 %package -n libwbclient-devel
 License:        LGPL-3.0+
@@ -547,12 +547,12 @@ BuildRequires:  pkgconfig
 Requires:       libwbclient0 = %{version}
 
 %description -n libwbclient-devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
 
@@ -564,11 +564,11 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libtalloc2
+This package includes the talloc library.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-This package includes the talloc library.
-
 
 %package -n libtalloc-devel
 Version:        %{libtalloc_ver}
@@ -583,12 +583,12 @@ BuildRequires:  pkgconfig
 Requires:       libtalloc2 = %{libtalloc_ver}
 
 %description -n libtalloc-devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %package -n libtdb1
 Version:        %{libtdb_ver}
@@ -598,11 +598,11 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libtdb1
+This package includes the tdb library.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-This package includes the tdb library.
-
 
 %package -n libtdb-devel
 Version:        %{libtdb_ver}
@@ -613,12 +613,12 @@ Group:          Development/Libraries/C and C++
 Requires:       libtdb1 = %{libtdb_ver}
 
 %description -n libtdb-devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %package -n libtevent0
 Version:        %{libtevent_ver}
@@ -628,11 +628,11 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libtevent0
+This package includes the tevent library.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-This package includes the tevent library.
-
 
 %package -n libtevent-devel
 Version:        %{libtevent_ver}
@@ -648,12 +648,12 @@ Requires:       libtalloc-devel
 Requires:       libtevent0 = %{libtevent_ver}
 
 %description -n libtevent-devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %package -n libldb1
 Version:        %{libldb_ver}
@@ -664,11 +664,11 @@ BuildRequires:  popt-devel
 PreReq:         /sbin/ldconfig
 
 %description -n libldb1
+This package includes the ldb library.
+
 Source timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 
-This package includes the ldb library.
-
 
 %package -n libldb-devel
 Version:        %{libldb_ver}
@@ -684,12 +684,12 @@ Requires:       libldb1 = %{libldb_ver}
 Requires:       libtalloc-devel
 
 %description -n libldb-devel
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 %endif
 
 %if %{make_ldapsmb}
@@ -703,12 +703,12 @@ Group:          Productivity/Networking/Samba
 Requires:       perl-ldap
 
 %description -n ldapsmb
-Source timestamp: %{SOURCE_TIMESTAMP}
-Branch:         %{BRANCH}
-
 This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
 %endif
 

vendor-files.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e021b431ff73b8c54b13b1ddf2b334c91ef4cbe0984f5d8b40ba18b6cbe29df
+oid sha256:d146e1dcd09e0dded5c6336d58deca763e5bdb819241dc0de0baef6386a5fe0f
-size 53424
+size 53431