diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 2c4a817..9f4aef8 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8df6b650eea001162d6ada39a9d76bbac08f1030028f5a84460dc34c2a95e4c8 -size 86603 +oid sha256:dc185fcdcde51f3760a278eaf41d5ba9590bd27ec898b1418fb343ef2cefbc3a +size 86527 diff --git a/samba.changes b/samba.changes index 5e6e68b..a7f50ab 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 8 15:36:42 UTC 2014 - lmuelle@suse.com + +- Call stop_on_removal from preun and restart_on_update and insserv_cleanup + from postun on pre-12.3 systems only; (bnc#856759). + ------------------------------------------------------------------- Mon Jan 6 21:37:37 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 0bd8a88..eac8fdb 100644 --- a/samba.spec +++ b/samba.spec @@ -135,7 +135,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3139 +%define SOURCE_TIMESTAMP 3140 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1517,9 +1517,10 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || : %endif %preun -%{?stop_on_removal:%{stop_on_removal smb nmb}} %if 0%{?suse_version} > 1220 %service_del_preun nmb.service smb.service +%else +%{?stop_on_removal:%{stop_on_removal smb nmb}} %endif %post @@ -1530,10 +1531,11 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || : %endif %postun -%{?restart_on_update:%{restart_on_update nmb smb}} -%{?insserv_cleanup:%{insserv_cleanup}} %if 0%{?suse_version} > 1220 %service_del_postun nmb.service smb.service +%else +%{?restart_on_update:%{restart_on_update nmb smb}} +%{?insserv_cleanup:%{insserv_cleanup}} %endif %pre client @@ -1711,9 +1713,10 @@ fi %endif %preun winbind -%{?stop_on_removal:%{stop_on_removal winbind}} %if 0%{?suse_version} > 1220 %service_del_preun winbind.service +%else +%{?stop_on_removal:%{stop_on_removal winbind}} %endif %postun winbind @@ -1727,10 +1730,11 @@ if [ -x %{_sbindir}/nscd ]; then fi fi %endif -%{?restart_on_update:%{restart_on_update winbind}} -%{?insserv_cleanup:%{insserv_cleanup}} %if 0%{?suse_version} > 1220 %service_del_postun winbind.service +%else +%{?restart_on_update:%{restart_on_update winbind}} +%{?insserv_cleanup:%{insserv_cleanup}} %endif %post -n %{libsmbclient_name} -p /sbin/ldconfig diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 8c7ad72..efb689e 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:d49a04bc4d2fc4e8fcc0c13c97c3437702c3a87ecf90b55ce646a4b354b9cbbd -size 54084 +oid sha256:784e203044122ffd664f9f212e046d79e39c28654ca47d0ecb30e41cd0894099 +size 53878