Djam/glibc
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/glibc.git synced 2025-02-23 23:12:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

finish /usr merge

Browse source
This commit is contained in:
Mikhail Novosyolov 2024-10-08 21:39:01 +03:00
parent d8a6dc711f
commit c4ca548010
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
glibc.spec
View file

@ -127,7 +127,7 @@ Version: 2.40
#Source0: http://ftp.gnu.org/gnu/glibc/%%{oname}-%%{version}.tar.xz #Source0: http://ftp.gnu.org/gnu/glibc/%%{oname}-%%{version}.tar.xz
# use ./upd.sh to make a tarball and automatically update Release # use ./upd.sh to make a tarball and automatically update Release
Source0: glibc-%{commit}.tar.xz Source0: glibc-%{commit}.tar.xz
Release: 7.git%{commit_short}.1 Release: 7.git%{commit_short}.2
License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System/Libraries Group: System/Libraries
Url: http://www.gnu.org/software/libc/ Url: http://www.gnu.org/software/libc/
@ -438,19 +438,6 @@ rpm.execute("/usr/sbin/ldconfig", "-X")
%transfiletriggerpostun -p <lua> -P 2000000 -- /lib /lib64 /usr/lib /usr/lib64 /etc/ld.so.conf.d %transfiletriggerpostun -p <lua> -P 2000000 -- /lib /lib64 /usr/lib /usr/lib64 /etc/ld.so.conf.d
rpm.execute("/usr/sbin/ldconfig", "-X") rpm.execute("/usr/sbin/ldconfig", "-X")
%filetriggerin -p <lua> -P 2000000 -- /lib /lib64 /usr/lib /etc/ld.so.conf.d
-- Transaction-level runs of ldconfigs are not enough:
-- e.g. lib64acl1 (/lib64/libacl.so.1) is installed after glibc, but is needed by
-- scriptlets of packages that are installed in the same transaction before its end
-- (between runs of ldconfig in glibc's %%post and glibc's transaction file trigger)
-- TODO: remove /lib64 from non-transaction triggers when it becomes a symlink to /usr/lib64
-- ld-linux finds libraries in standard paths (now /lib64 is not a standard path after /usr merge!)
-- even if ldconfig was not run.
rpm.execute("/usr/sbin/ldconfig", "-X")
%filetriggerpostun -p <lua> -P 2000000 -- /lib /lib64 /usr/lib /etc/ld.so.conf.d
rpm.execute("/usr/sbin/ldconfig", "-X")
%endif %endif
%posttrans -p <lua> %posttrans -p <lua>