From 348fac2d7c59c15d4073f99893661684d43229be2c41eba3586f767f599bb64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 29 Oct 2012 17:13:29 +0000 Subject: [PATCH] Create ntadmin group only if it doesn't yet exist. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=259 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 5 ++++ samba.spec | 54 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 38 insertions(+), 33 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index fea20de..f4c554c 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2846 +2847 Branch : 3.6.9 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 6e49c76..cbbf5ad 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e085390a47162deba08f47463c36a2b66238cd81464744d554ec17ddf704549 -size 33772 +oid sha256:566892b97876697de0e1ad4f959793d4920139f3c8d698d42ba394f198a5af9b +size 33787 diff --git a/samba-doc.spec b/samba-doc.spec index 07c9a4a..92cbdd0 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -462,7 +462,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %changelog diff --git a/samba.changes b/samba.changes index 8640a5e..4a99166 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 29 16:59:09 UTC 2012 - lmuelle@suse.com + +- Create ntadmin group only if it doesn't yet exist. + ------------------------------------------------------------------- Mon Oct 29 12:10:41 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 2165569..8381faf 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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package client @@ -265,7 +265,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %endif @@ -310,7 +310,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %endif @@ -331,7 +331,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %if %{make_utils} @@ -347,7 +347,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %endif @@ -380,7 +380,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -406,14 +406,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %else %description -n libsmbclient0 -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %endif @@ -452,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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libnetapi0 @@ -465,7 +465,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libnetapi-devel @@ -484,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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -505,14 +505,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %else %description -n libsmbsharemodes0 -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %endif @@ -538,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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libwbclient0 @@ -551,7 +551,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libwbclient-devel @@ -570,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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -587,7 +587,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libtalloc-devel @@ -608,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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libtdb1 @@ -623,7 +623,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libtdb-devel @@ -640,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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libtevent0 @@ -655,7 +655,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libtevent-devel @@ -677,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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libldb1 @@ -693,7 +693,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %package -n libldb-devel @@ -714,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: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %endif @@ -734,7 +734,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2846 +Source Timestamp: 2847 Branch : 3.6.9 %endif @@ -1264,7 +1264,7 @@ popd %endif %pre -/usr/sbin/groupadd -g 71 -o -r ntadmin 2>/dev/null || : +getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || : %preun %{?stop_on_removal:%{stop_on_removal smb nmb}} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 2abb450..dfaf9ec 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:62fdf8363bd493681cd406a2657bcab3aafb0856f5ca07f0eb8dc6ce517b92b4 -size 53442 +oid sha256:dadc7a7f87e9f1db0337f3b15033b1d1a6d08cdfeae08fced9c8873913ea5172 +size 53461