Call stop_on_removal from preun and restart_on_update and insserv_cleanup

from postun on pre-12.3 systems only; (bnc#856759).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=363
This commit is contained in:
Lars Müller 2014-01-08 15:57:34 +00:00 committed by Git OBS Bridge
parent 0b95018e19
commit 90ad8c4216
4 changed files with 21 additions and 11 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8df6b650eea001162d6ada39a9d76bbac08f1030028f5a84460dc34c2a95e4c8
size 86603
oid sha256:dc185fcdcde51f3760a278eaf41d5ba9590bd27ec898b1418fb343ef2cefbc3a
size 86527

View File

@ -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

View File

@ -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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d49a04bc4d2fc4e8fcc0c13c97c3437702c3a87ecf90b55ce646a4b354b9cbbd
size 54084
oid sha256:784e203044122ffd664f9f212e046d79e39c28654ca47d0ecb30e41cd0894099
size 53878