From c09c66271efa0b20e393c0b30d0d20cbfe8716f5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 6 Feb 2018 11:25:39 +0100 Subject: [PATCH] move %transfiletrigger* in common subpackage Signed-off-by: Igor Gnatenko --- glibc.spec | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/glibc.spec b/glibc.spec index 8247598..d9a9d87 100644 --- a/glibc.spec +++ b/glibc.spec @@ -348,28 +348,6 @@ contains the most important sets of shared libraries: the standard C library and the standard math library. Without these two libraries, a Linux system will not function. -###################################################################### -# File triggers to do ldconfig calls automatically (see rhbz#1380878) -###################################################################### - -# File triggers for when libraries are added or removed in standard -# paths. Use Lua to avoid a dependency on /bin/sh. Due to an RPM -# spec file parser deficiency, we cannot move the trigger into a -# subpackage. -%transfiletriggerin -p -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64 -os.execute("/sbin/ldconfig") -%end - -%transfiletriggerpostun -p -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64 -os.execute("/sbin/ldconfig") -%end - -# We need to run ldconfig manually because ldconfig cannot handle the -# relative include path in the /etc/ld.so.conf file we generate. -%undefine __brp_ldconfig - -###################################################################### - ###################################################################### # libnsl subpackage ###################################################################### @@ -461,6 +439,26 @@ Requires: tzdata >= 2003a The glibc-common package includes common binaries for the GNU libc libraries, as well as national language (locale) support. +###################################################################### +# File triggers to do ldconfig calls automatically (see rhbz#1380878) +###################################################################### + +# File triggers for when libraries are added or removed in standard +# paths. Use Lua to avoid a dependency on /bin/sh. +%transfiletriggerin common -p -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64 +os.execute("/sbin/ldconfig") +%end + +%transfiletriggerpostun common -p -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64 +os.execute("/sbin/ldconfig") +%end + +# We need to run ldconfig manually because ldconfig cannot handle the +# relative include path in the /etc/ld.so.conf file we gneerate. +%undefine __brp_ldconfig + +###################################################################### + %package locale-source Summary: The sources for the locales Requires: %{name} = %{version}-%{release}