- Replace manual systemd scriptlets with macroized scriptlets

(#850129)
This commit is contained in:
Jeff Law 2012-08-21 09:47:24 -06:00
parent 31474e7c11
commit f8556b4c45

View File

@ -27,7 +27,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 4%{?dist} Release: 5%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs # Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -1223,24 +1223,16 @@ getent passwd nscd >/dev/null ||
-c "NSCD Daemon" -u 28 -g nscd nscd -c "NSCD Daemon" -u 28 -g nscd nscd
%post -n nscd %post -n nscd
if test $1 -eq 1; then %systemd_post nscd.service
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%preun -n nscd %preun -n nscd
if test $1 -eq 0; then %systemd_preun nscd.service
/bin/systemctl --no-reload disable nscd.service > /dev/null 2>&1 || :
/bin/systemctl stop nscd.service > /dev/null 2>&1 || :
fi
%postun -n nscd %postun -n nscd
if test $1 = 0; then if test $1 = 0; then
/usr/sbin/userdel nscd > /dev/null 2>&1 || : /usr/sbin/userdel nscd > /dev/null 2>&1 || :
fi fi
/bin/systemctl daemon-reload >/dev/null 2>&1 || : %systemd_postun_with_restart nscd.service
if test $1 -ge 1; then
/bin/systemctl try-restart nscd.service >/dev/null 2>&1 || :
fi
%if %{xenpackage} %if %{xenpackage}
%post xen -p /sbin/ldconfig %post xen -p /sbin/ldconfig
@ -1355,6 +1347,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue Aug 21 2012 Jeff Law <law@redhat.com> - 2.16.90-5
- Replace manual systemd scriptlets with macroized scriptlets (#850129)
* Mon Aug 20 2012 Jeff Law <law@redhat.com> - 2.16.90-4 * Mon Aug 20 2012 Jeff Law <law@redhat.com> - 2.16.90-4
- Move /etc/localtime into glibc-common package since glibc-common - Move /etc/localtime into glibc-common package since glibc-common
owns the scriptlets which update it. owns the scriptlets which update it.