[glibc] Reduce set of required RPM features.
Carlos O'Donell
codonell at fedoraproject.org
Tue Mar 17 05:55:46 UTC 2015
commit e51327973f070a4ebfb999fbe8633e0e7b1c3c35
Author: Carlos O'Donell <carlos at systemhalted.org>
Date: Tue Mar 17 01:53:46 2015 -0400
Reduce set of required RPM features.
- Use rpm.expand in scripts to reduce set of required RPM features.
See:
https://bugzilla.redhat.com/show_bug.cgi?id=156477#c44
glibc.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 1221228..546bfed 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.21-194-g2e807f2
%define glibcversion 2.21.90
-%define glibcrelease 6%{?dist}
+%define glibcrelease 7%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@@ -1579,22 +1579,22 @@ end
%postun -p /sbin/ldconfig
-%triggerin common -e -p <lua> -- glibc
+%triggerin common -p <lua> -- glibc
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", "%%{_install_langs}")
+ posix.exec("%{_prefix}/sbin/build-locale-archive", "--install-langs", rpm.expand("%%{_install_langs}"))
elseif pid > 0 then
posix.wait(pid)
end
end
-%post common -e -p <lua>
+%post common -p <lua>
if posix.access("/etc/ld.so.cache") then
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", "%%{_install_langs}")
+ posix.exec("%{_prefix}/sbin/build-locale-archive", "--install-langs", rpm.expand("%%{_install_langs}"))
elseif pid > 0 then
posix.wait(pid)
end
@@ -1751,6 +1751,9 @@ rm -f *.filelist*
%endif
%changelog
+* Tue Mar 17 2015 Carlos O'Donell <carlos at redhat.com> - 2.21.90-7
+- Use rpm.expand in scripts to reduce set of required RPM features.
+
* Thu Mar 12 2015 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.21.90-6
- Auto-sync with upstream master.
More information about the scm-commits
mailing list