From 1bbad64354742afa02998ebe4a2b2de5d0b78ccf Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Sat, 18 Jun 2016 17:14:06 -0400 Subject: [PATCH] Use scriptlet expansion. We prefer scriptlet expansion (-e) over the use of rpm.expand in Lua. The goal is to have a fully expanded Lua program with as little dynamic processing as possible to simplify the operations carried out in Lua. The use of rpm.expand was only needed until COPR migrated from EL6 to Fedora, and with this complete we can remove the use of rpm.expand in favour of scriptlet expansion. Tested on Fedora Rawhide by verifying global setting of %_install_langs macro changes installed locale-archive locales correctly. --- glibc.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index 7466968..946f678 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ %define glibcsrcdir glibc-2.23-465-g31d0a4f %define glibcversion 2.23.90 -%define glibcrelease 22%{?dist} +%define glibcrelease 23%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -1882,7 +1882,7 @@ end %postun -p /sbin/ldconfig -%posttrans all-langpacks -p +%posttrans all-langpacks -e -p -- If at the end of the transaction we are still installed -- (have a template of non-zero size), then we rebuild the -- locale cache (locale-archive) from the pre-populated @@ -1890,7 +1890,7 @@ end if posix.stat("%{_prefix}/lib/locale/locale-archive.tmpl", "size") > 0 then pid = posix.fork() if pid == 0 then - posix.exec("%{_prefix}/sbin/build-locale-archive", "--install-langs", rpm.expand("%%{_install_langs}")) + posix.exec("%{_prefix}/sbin/build-locale-archive", "--install-langs", "%%{_install_langs}") elseif pid > 0 then posix.wait(pid) end @@ -2069,6 +2069,10 @@ rm -f *.filelist* %endif %changelog +* Sat Jun 18 2016 Carlos O'Donell - 2.23.90-23 +- Use scriptlet expansion in all-langpacks posttrans script to expand + _install_langes macro. + * Mon Jun 13 2016 Florian Weimer - 2.23.90-22 - Remove glibc-fedora-uname-getrlimit.patch. This patch was introduced to fix bug rhbz#579086 (Preloading a replacement uname