From 21b442117930106ab47b97f4951c1bc2f72d9671bd207bfea6eabb2fd635a7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 26 Sep 2012 14:57:26 +0000 Subject: [PATCH] Prerequire SuSEconfig.permissions on post-10.1 and pre-12.3 SUSE systems only; (bnc#782293). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=254 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 6 +++++ samba.spec | 54 ++++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 40 insertions(+), 32 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 013ebe4..623ef45 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2839 +2841 Branch : 3.6.8 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 82d1275..b855861 100644 --- 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:d128265a605b564ab1be777b70c9547842102d0584f14b87adf3fe59fb08f043 +size 33734 diff --git a/samba-doc.spec b/samba-doc.spec index 09490c0..a2a82fb 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -463,7 +463,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %changelog diff --git a/samba.changes b/samba.changes index 4bfdea0..91750b0 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 26 13:42:41 UTC 2012 - lmuelle@suse.com + +- Prerequire SuSEconfig.permissions on post-10.1 and pre-12.3 SUSE systems + only; (bnc#782293). + ------------------------------------------------------------------- Mon Sep 17 12:00:22 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 1b78a27..1909f17 100644 --- 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: 2841 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: 2841 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: 2841 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: 2841 Branch : 3.6.8 %endif @@ -323,7 +323,9 @@ PreReq: coreutils Provides: samba-gplv3-krb-printing = %{version} Obsoletes: samba-gplv3-krb-printing < %{version} %if 0%{?suse_version} > 1000 +%if 0%{?suse_version} < 1221 PreReq: /sbin/conf.d/SuSEconfig.permissions +%endif PreReq: permissions %endif Requires: samba-client >= %{version} @@ -332,7 +334,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %if %{make_utils} @@ -348,7 +350,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %endif @@ -381,7 +383,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -407,14 +409,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %else %description -n libsmbclient0 -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %endif @@ -453,7 +455,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: 2841 Branch : 3.6.8 %package -n libnetapi0 @@ -466,7 +468,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %package -n libnetapi-devel @@ -485,7 +487,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: 2841 Branch : 3.6.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -506,14 +508,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %else %description -n libsmbsharemodes0 -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %endif @@ -539,7 +541,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: 2841 Branch : 3.6.8 %package -n libwbclient0 @@ -552,7 +554,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %package -n libwbclient-devel @@ -571,7 +573,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: 2841 Branch : 3.6.8 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -588,7 +590,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %package -n libtalloc-devel @@ -609,7 +611,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: 2841 Branch : 3.6.8 %package -n libtdb1 @@ -624,7 +626,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %package -n libtdb-devel @@ -641,7 +643,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: 2841 Branch : 3.6.8 %package -n libtevent0 @@ -656,7 +658,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %package -n libtevent-devel @@ -678,7 +680,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: 2841 Branch : 3.6.8 %package -n libldb1 @@ -694,7 +696,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %package -n libldb-devel @@ -715,7 +717,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: 2841 Branch : 3.6.8 %endif @@ -735,7 +737,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2839 +Source Timestamp: 2841 Branch : 3.6.8 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index a3194ed..9901410 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:894053594ec0194ec04b3506f0a3becf85cb2353d0cde7c519bb66a00f93817d -size 52501 +oid sha256:9a7f4ed5238170f3515b0a07cf1eff203598f9eaf4e9aa0f10fbf406d66f9b12 +size 53452