Accepting request 137385 from network:samba:STABLE

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/137385 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=125
2012-10-07 18:02:34 +00:00
parent 8570876016 3437a3c974
commit d46531427a
6 changed files with 44 additions and 35 deletions
--- a/2
+++ b/2
@@ -1,2 +1,2 @@
-2839
+2843
 Branch      : 3.6.8
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a17aff210e10b9f10cce1bfac49f8fcc47488584e477e58df4f8a7bc4d6b01c
-size 33263
+oid sha256:68dd9006858b2f601cc8c614e4ea035ed1edbcc262aa6f28eb395bc5114c9d29
+size 33754
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -367,7 +367,6 @@ pushd vendor-files
 echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf
 echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.conf
 echo "# samba-doc package is installed." >>config/smb.conf
-echo "# Date: $( date -I)" >>config/smb.conf
 grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf
 install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR}
 # SuSEhelp files
@@ -463,7 +462,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %changelog
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep 26 18:07:49 UTC 2012 - lmuelle@suse.com
+
+- Do not write the build date into the header of the default smb.conf as this
+  causses superfluous rebuilds of packages depending on samba; (bnc#781601).
+
+-------------------------------------------------------------------
+Wed Sep 26 13:42:41 UTC 2012 - lmuelle@suse.com
+
+- Do not prerequire SuSEconfig.permissions as it's already enough and more
+  generic to depend on the permissions package; (bnc#782293).
+
 -------------------------------------------------------------------
 Mon Sep 17 12:00:22 UTC 2012 - lmuelle@suse.com

--- a/samba.spec
+++ b/samba.spec
@@ -224,7 +224,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package client
@@ -265,7 +265,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -285,7 +285,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of Samba.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %endif
@@ -310,7 +310,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %endif
@@ -323,7 +323,6 @@ PreReq:         coreutils
 Provides:       samba-gplv3-krb-printing = %{version}
 Obsoletes:      samba-gplv3-krb-printing < %{version}
 %if 0%{?suse_version} > 1000
-PreReq:         /sbin/conf.d/SuSEconfig.permissions
 PreReq:         permissions
 %endif
 Requires:       samba-client >= %{version}
@@ -332,7 +331,7 @@ Requires:       samba-client >= %{version}
 A wrapper binary to run smbspool with the original calling UID.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %if %{make_utils}
@@ -348,7 +347,7 @@ Obsoletes:      samba-gplv3-utils < %{version}
 Some of the debug-tools for developpers.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %endif
@@ -381,7 +380,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -407,14 +406,14 @@ PreReq:         /sbin/ldconfig

 %description -n libsmbclient

-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %else

 %description -n libsmbclient0

-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %endif
@@ -453,7 +452,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libnetapi0
@@ -466,7 +465,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libnetapi-devel
@@ -485,7 +484,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -506,14 +505,14 @@ PreReq:         /sbin/ldconfig

 %description -n libsmbsharemodes

-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %else

 %description -n libsmbsharemodes0

-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %endif
@@ -539,7 +538,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libwbclient0
@@ -552,7 +551,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libwbclient-devel
@@ -571,7 +570,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %if 0%{?suse_version} && 0%{?suse_version} < 1211
@@ -588,7 +587,7 @@ PreReq:         /sbin/ldconfig
 This package includes the talloc library.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libtalloc-devel
@@ -609,7 +608,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libtdb1
@@ -624,7 +623,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libtdb-devel
@@ -641,7 +640,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libtevent0
@@ -656,7 +655,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libtevent-devel
@@ -678,7 +677,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libldb1
@@ -694,7 +693,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %package -n libldb-devel
@@ -715,7 +714,7 @@ Requires:       libtalloc-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.

-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %endif
@@ -735,7 +734,7 @@ This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.


-Source Timestamp: 2839
+Source Timestamp: 2843
 Branch      : 3.6.8

 %endif
@@ -1051,7 +1050,6 @@ pushd vendor-files
 echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf
 echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.conf
 echo "# samba-doc package is installed." >>config/smb.conf
-echo "# Date: $( date -I)" >>config/smb.conf
 grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf
 install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR}
 for file in smb.conf lmhosts smbusers smbpasswd cifstab smbusers; do
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:894053594ec0194ec04b3506f0a3becf85cb2353d0cde7c519bb66a00f93817d
-size 52501
+oid sha256:b9ef778ec3968aabf3676a67a586f99b6657aa3eb4d1f539ba77f66d8fced267
+size 53305