diff --git a/patches.tar.bz2 b/patches.tar.bz2 index e149b7a..dcfbbf9 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:737b49ddce985a38831576325e1cff02f058f01c3bccc674dfad4b133a67cdb0 -size 71125 +oid sha256:63495c38f2b027e56578884e7c7dbc37847b1a6821a0349f710e2712c81924de +size 71322 diff --git a/samba.changes b/samba.changes index c62d4b6..2f2866b 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 20 10:47:54 UTC 2014 - lmuelle@suse.com + +- Default sysconfig daemon options to -D; (bnc#857454). + ------------------------------------------------------------------- Thu Jan 16 19:19:58 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index b8c510b..36a1ce7 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3149 +%define SOURCE_TIMESTAMP 3150 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1364,9 +1364,9 @@ for srv_name in nmb smb winbind; do ../packaging/systemd/${srv_name}.service \ >%{buildroot}/%{_unitdir}/${srv_name}.service echo -en "## Type: string -## Default: \"\" +## Default: \"-D\" ## ServiceRestart:ยท${srv_name} -${srv_name^^}DOPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name} +${srv_name^^}DOPTIONS=\"-D\"\n" >>SUSE.sysconfig.${srv_name} ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name} done head -n 2 ../packaging/systemd/samba.sysconfig > \ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 2927a30..20ecde8 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:f088cb963b4ad40f07f844e699699e3e8e806bcacd0c8c4e9b0eb14c8c65affc -size 53881 +oid sha256:72bdf9eeaf035395a85e467c7f7a6b78117c4b82be0608429358511fe7247c31 +size 54003