From 5284b3d2afe3e0445db75873386d8a220a110fdff154ecd3987fbb354d8463b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 22 Feb 2016 17:29:53 +0000 Subject: [PATCH] Shift samba-client sysconfig data into samba and samba-winbind; (bsc#947361). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=525 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 7 +------ vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index c723d0c..2199a3f 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d17eef39b5da907fa0cf6432a6e56d32fa97e4456532714b016dc5dcc140032a -size 13402 +oid sha256:c3f0e09986e9102d3d3190135b6e7f134b77b91601ecc9628c28c6297b8ecae2 +size 13394 diff --git a/samba.changes b/samba.changes index 7a8fa9e..b0ef4ff 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 22 16:16:32 UTC 2016 - lmuelle@suse.com + +- Shift samba-client sysconfig data into samba and samba-winbind; (bsc#947361). + ------------------------------------------------------------------- Sun Feb 14 18:41:34 UTC 2016 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 155aa28..364a086 100644 --- a/samba.spec +++ b/samba.spec @@ -142,7 +142,7 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3597 +%define SOURCE_TIMESTAMP 3598 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -257,7 +257,6 @@ Obsoletes: samba-gplv3-client < %{version} Provides: samba-client-gplv2 = %{version} Obsoletes: samba-client-gplv2 < %{version} %if 0%{?suse_version} > 0 -PreReq: %{?fillup_prereq} PreReq: %{?insserv_prereq} %endif PreReq: /sbin/chkconfig @@ -1589,9 +1588,6 @@ fi if ! test -e %{_bindir}/get_printing_ticket; then ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb fi -%if 0%{?suse_version} > 1220 -%{fillup_only -ans samba client} -%endif %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}} %postun client @@ -1964,7 +1960,6 @@ fi %if 0%{?suse_version} > 1220 %dir %{_tmpfilesdir} %{_tmpfilesdir}/samba.conf -%{_var}/adm/fillup-templates/sysconfig.samba-client %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 01c2586..cd085af 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:4c9f97bf7a546015c75c529eab6a15333a869c54ea6b3b8235e31c30cd4fa29b -size 55782 +oid sha256:0a66f53307da0b03db4f8cbb690fb9307d5282dc08d7f98cdcb578b24d4adfef +size 55792