Move %end to %ldconfig_scriptlets

If people choose to use %ldconfig_post/%ldconfig_postun, let them to
deal with %end.

Reported-by: Harald Reindl <h.reindl@thelounge.net>
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1547838
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
(cherry picked from commit 987e94f6ea)
This commit is contained in:
Igor Gnatenko 2018-02-22 07:58:50 +01:00
parent 2d84b07718
commit 1a0aca9d26
2 changed files with 8 additions and 5 deletions

View File

@ -1,9 +1,9 @@
%ldconfig /sbin/ldconfig
%ldconfig_post %{?ldconfig:%post -p %ldconfig\
%end}
%ldconfig_postun %{?ldconfig:%postun -p %ldconfig\
%end}
%ldconfig_post %{?ldconfig:%post -p %ldconfig}
%ldconfig_postun %{?ldconfig:%postun -p %ldconfig}
%ldconfig_scriptlets(n:) %{?ldconfig:\
%ldconfig_post %{?*} %{-n:-n %{-n*}}\
%end\
%ldconfig_postun %{?*} %{-n:-n %{-n*}}\
%end\
}

View File

@ -6,7 +6,7 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: 74
Version: 75
Release: 1%{?dist}
# No version specified.
License: GPL+
@ -147,6 +147,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
%{_rpmconfigdir}/macros.d/macros.kmp
%changelog
* Thu Feb 22 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 75-1
- Move %%end to %%ldconfig_scriptlets
* Wed Feb 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 74-1
- Fix the inevitable embarrassing typo in 73, doh