From 6d6dcc0612ecbf6e9b77845fb97ecaa8141bbd16 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 29 Jan 2018 22:53:34 +0100 Subject: [PATCH] Add macros.ldconfig With https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets we try to remove ldconfig scriptlets, but it would make every package look horrible with all those conditionals. So let's just wrap ldconfig scriptlets into macro so it doesn't look that horrible and error-prone. Signed-off-by: Igor Gnatenko --- macros.ldconfig | 7 +++++++ redhat-rpm-config.spec | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 macros.ldconfig diff --git a/macros.ldconfig b/macros.ldconfig new file mode 100644 index 0000000..672d4c5 --- /dev/null +++ b/macros.ldconfig @@ -0,0 +1,7 @@ +%ldconfig /sbin/ldconfig +%ldconfig_post %{?ldconfig:%post -p %ldconfig} +%ldconfig_postun %{?ldconfig:%postun -p %ldconfig} +%ldconfig_scriptlets(n:) %{?ldconfig:\ +%ldconfig_post %{?*} %{-n:-n %{-n*}}\ +%ldconfig_postun %{?*} %{-n:-n %{-n*}}\ +} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index d0920cc..7150e6d 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,8 +6,8 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 63 -Release: 2%{?dist} +Version: 64 +Release: 1%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -36,6 +36,7 @@ Source105: macros.valgrind-srpm Source150: macros.dwz Source151: macros.kmp Source152: macros.vpath +Source153: macros.ldconfig # Dependency generator scripts (deprecated) Source300: find-provides @@ -129,6 +130,7 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov %{_rpmconfigdir}/kmod.prov %{_rpmconfigdir}/macros.d/macros.*-srpm %{_rpmconfigdir}/macros.d/macros.dwz +%{_rpmconfigdir}/macros.d/macros.ldconfig %{_rpmconfigdir}/macros.d/macros.vpath %files -n kernel-rpm-macros @@ -143,6 +145,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Jan 29 2018 Igor Gnatenko - 64-1 +- Add macros.ldconfig + * Thu Dec 21 2017 Björn Esser - 63-2 - Add Requires: cmake-rpm-macros for CMake auto-{provides,requires} (#1498894)