metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

Use scriptlet expansion.

Browse Source 
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.
This commit is contained in:
Carlos O'Donell 2016-06-18 17:14:06 -04:00
parent c27c24530c
commit 1bbad64354
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.23-465-g31d0a4f %define glibcsrcdir glibc-2.23-465-g31d0a4f
%define glibcversion 2.23.90 %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 # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -1882,7 +1882,7 @@ end
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%posttrans all-langpacks -p <lua> %posttrans all-langpacks -e -p <lua>
-- If at the end of the transaction we are still installed -- If at the end of the transaction we are still installed
-- (have a template of non-zero size), then we rebuild the -- (have a template of non-zero size), then we rebuild the
-- locale cache (locale-archive) from the pre-populated -- 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 if posix.stat("%{_prefix}/lib/locale/locale-archive.tmpl", "size") > 0 then
pid = posix.fork() pid = posix.fork()
if pid == 0 then 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 elseif pid > 0 then
posix.wait(pid) posix.wait(pid)
end end
@ -2069,6 +2069,10 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Sat Jun 18 2016 Carlos O'Donell <carlos@redhat.com> - 2.23.90-23
- Use scriptlet expansion in all-langpacks posttrans script to expand
_install_langes macro.
* Mon Jun 13 2016 Florian Weimer <fweimer@redhat.com> - 2.23.90-22 * Mon Jun 13 2016 Florian Weimer <fweimer@redhat.com> - 2.23.90-22
- Remove glibc-fedora-uname-getrlimit.patch. This patch was - Remove glibc-fedora-uname-getrlimit.patch. This patch was
introduced to fix bug rhbz#579086 (Preloading a replacement uname introduced to fix bug rhbz#579086 (Preloading a replacement uname