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

ldconfig: make %ldconfig_post/%ldconfig_postun parameterized

Browse Source 
If %ldconfig is not defined, then "%ldconfig_post/%ldconfig_postun foo"
will expand to " foo" which is breaking packages.

Also now it is possible to move %end into post/postun.

Reported-by: Terje Røsten <terjeros@phys.ntnu.no>
References: https://bugzilla.redhat.com/show_bug.cgi?id=1548331
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2018-02-25 07:06:32 +01:00
parent 0448c23b73
commit 71d7440127
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(n:) %{?ldconfig:%post -p %ldconfig %{?*} %{-n:-n %{-n*}}\
%ldconfig_postun %{?ldconfig:%postun -p %ldconfig} %end}
%ldconfig_postun(n:) %{?ldconfig:%postun -p %ldconfig %{?*} %{-n:-n %{-n*}}\
%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: 102 Version: 103
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
* Sun Feb 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 103-1
- Make %%ldconfig_post/%%ldconfig_postun parameterized
* Sat Feb 24 2018 Florian Weimer <fweimer@redhat.com> - 102-1 * Sat Feb 24 2018 Florian Weimer <fweimer@redhat.com> - 102-1
- Second step of -z now move: removal from GCC specs file (#1548397) - Second step of -z now move: removal from GCC specs file (#1548397)