rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Move %end to %ldconfig_scriptlets

Browse Source 
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>
This commit is contained in:
Igor Gnatenko 2018-02-22 07:58:50 +01:00
parent 17746cb929
commit 987e94f6ea
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
macros.ldconfig
View File

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

5
redhat-rpm-config.spec
View File

@ -6,7 +6,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 98 Version: 99
Release: 1%{?dist} Release: 1%{?dist}
# No version specified. # No version specified.
License: GPL+ License: GPL+
@ -183,6 +183,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
%{_rpmconfigdir}/macros.d/macros.kmp %{_rpmconfigdir}/macros.d/macros.kmp
%changelog %changelog
* Thu Feb 22 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 99-1
- Move %%end to %%ldconfig_scriptlets
* Sat Feb 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 98-1 * Sat Feb 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 98-1
- Explicitly close scriptlets with %%end (ldconfig) - Explicitly close scriptlets with %%end (ldconfig)