rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'c9-beta' into a9-beta

Browse Source
This commit is contained in:
eabdullin 2024-09-30 16:31:18 +00:00 committed by eabdullin
commit ed0bb070dd
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SOURCES/brp-mangle-shebangs
View File

@ -137,10 +137,10 @@ while IFS= read -r line; do
fi fi
# Replace "special" env shebang: # Replace "special" env shebang:
# /whatsoever/env /whatever/foo → /whatever/foo # /whatsoever/env -whatever /whatever/foo → /whatever/foo
shebang=$(echo "$shebang" | sed -r -e 's@^(.+)/env /(.+)$@/\2@') shebang=$(echo "$shebang" | sed -r -e 's@^(.+)/env( -[^ ]+)* /(.+)$@/\3@')
# /whatsoever/env foo → /whatsoever/foo # /whatsoever/env -whatever foo → /whatsoever/foo
shebang=$(echo "$shebang" | sed -r -e 's@^(.+/)env (.+)$@\1\2@') shebang=$(echo "$shebang" | sed -r -e 's@^(.+/)env( -[^ ]+)* (.+)$@\1\3@')
# If the shebang now starts with /bin, change it to /usr/bin # If the shebang now starts with /bin, change it to /usr/bin
# https://bugzilla.redhat.com/show_bug.cgi?id=1581757 # https://bugzilla.redhat.com/show_bug.cgi?id=1581757

4
SOURCES/libsymlink.attr
View File

@ -1,5 +1,5 @@
# Make libfoo.so symlinks require the soname-provide of the target library # Make libfoo.so symlinks require the soname-provide of the target library
%__libsymlink_requires %{_rpmconfigdir}/elfdeps --provides --soname-only %__libsymlink_requires %{_rpmconfigdir}/elfdeps --provides --soname-only
%__libsymlink_magic ^symbolic link to .*lib.*\.so\..*$ %__libsymlink_magic ^symbolic link to .*lib.*\\.so\\..*$
%__libsymlink_path ^.*\.so$ %__libsymlink_path ^.*\\.so$
%__libsymlink_flags magic_and_path %__libsymlink_flags magic_and_path

7
SPECS/redhat-rpm-config.spec
View File

@ -6,7 +6,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 207 Version: 208
Release: 1%{?dist}.alma.1 Release: 1%{?dist}.alma.1
# No version specified. # No version specified.
License: GPL+ License: GPL+
@ -254,9 +254,12 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
%doc buildflags.md %doc buildflags.md
%changelog %changelog
* Thu Mar 28 2024 Eduard Abdullin <eabdullin@almalinux.org> - 207-1.alma.1 * Mon Sep 30 2024 Eduard Abdullin <eabdullin@almalinux.org> - 208-1.alma.1
- Fix AlmaLinux detection - Fix AlmaLinux detection
* Fri Jul 19 2024 Michal Domonkos <mdomonko@redhat.com> - 208-1
- brp-mangle-shebangs: Strip env flags when mangling shebangs (RHEL-26961)
- Fix automatic soname requires on non-versioned symlink targets (RHEL-28767)
* Thu Jan 18 2024 Miro Hrončok <mhroncok@redhat.com> - 207-1 * Thu Jan 18 2024 Miro Hrončok <mhroncok@redhat.com> - 207-1
- brp-python-bytecompile: Pass --invalidation-mode=timestamp to compileall - brp-python-bytecompile: Pass --invalidation-mode=timestamp to compileall
- Resolves: RHEL-22139 - Resolves: RHEL-22139