Revert "rpmlib.req: generate rpmlib(PosttransFiletriggers) dependency for /usr/lib/rpm/*.filetrigger"
Disable automatic rpmlib(PosttransFiletriggers) requirements for M41.
This reverts commit 3a9f159460
.
This commit is contained in:
parent
82d6fbdfe6
commit
f8fb514ad6
@ -1016,8 +1016,6 @@ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
|
|||||||
scripts/pam.req
|
scripts/pam.req
|
||||||
scripts/pkgconfig.req
|
scripts/pkgconfig.req
|
||||||
scripts/pkgconfiglib.req
|
scripts/pkgconfiglib.req
|
||||||
scripts/rpmlib.req
|
|
||||||
scripts/rpmlib.req.files
|
|
||||||
scripts/shebang.req
|
scripts/shebang.req
|
||||||
scripts/shell.prov
|
scripts/shell.prov
|
||||||
scripts/shell.req
|
scripts/shell.req
|
||||||
|
@ -506,7 +506,6 @@ fi
|
|||||||
%rpmattr %_rpmlibdir/pam.*
|
%rpmattr %_rpmlibdir/pam.*
|
||||||
%rpmattr %_rpmlibdir/pkgconfig.*
|
%rpmattr %_rpmlibdir/pkgconfig.*
|
||||||
%rpmattr %_rpmlibdir/pkgconfiglib.*
|
%rpmattr %_rpmlibdir/pkgconfiglib.*
|
||||||
%rpmattr %_rpmlibdir/rpmlib.*
|
|
||||||
%rpmattr %_rpmlibdir/shell.*
|
%rpmattr %_rpmlibdir/shell.*
|
||||||
%rpmattr %_rpmlibdir/shebang.*
|
%rpmattr %_rpmlibdir/shebang.*
|
||||||
%rpmattr %_rpmlibdir/static.*
|
%rpmattr %_rpmlibdir/static.*
|
||||||
|
@ -18,7 +18,6 @@ EXTRA_DIST = \
|
|||||||
ldd lib.req lib.req.files lib.prov lib.prov.files shlib.req.awk \
|
ldd lib.req lib.req.files lib.prov lib.prov.files shlib.req.awk \
|
||||||
pam.req pam.req.files pam.prov pam.prov.files perl.prov perl.req \
|
pam.req pam.req.files pam.prov pam.prov.files perl.prov perl.req \
|
||||||
pkgconfig.req pkgconfiglib.req pkgconfig.req.files \
|
pkgconfig.req pkgconfiglib.req pkgconfig.req.files \
|
||||||
rpmlib.req rpmlib.req.files \
|
|
||||||
rpmdiff rpmdiff.cgi rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
|
rpmdiff rpmdiff.cgi rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
|
||||||
shebang.req shebang.req.files \
|
shebang.req shebang.req.files \
|
||||||
shell.req shell.req.files shell.prov shell.prov.files \
|
shell.req shell.req.files shell.prov shell.prov.files \
|
||||||
@ -49,7 +48,6 @@ config_SCRIPTS = \
|
|||||||
ldd lib.req lib.req.files lib.prov lib.prov.files shlib.req.awk \
|
ldd lib.req lib.req.files lib.prov lib.prov.files shlib.req.awk \
|
||||||
pam.req pam.req.files pam.prov pam.prov.files perl.prov perl.req \
|
pam.req pam.req.files pam.prov pam.prov.files perl.prov perl.req \
|
||||||
pkgconfig.req pkgconfiglib.req pkgconfig.req.files \
|
pkgconfig.req pkgconfiglib.req pkgconfig.req.files \
|
||||||
rpmlib.req rpmlib.req.files \
|
|
||||||
rpmdiff rpmdiff.cgi rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
|
rpmdiff rpmdiff.cgi rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
|
||||||
shebang.req shebang.req.files \
|
shebang.req shebang.req.files \
|
||||||
shell.req shell.req.files shell.prov shell.prov.files \
|
shell.req shell.req.files shell.prov shell.prov.files \
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
#!/bin/sh -efu
|
|
||||||
|
|
||||||
# Actually we can use "AutoReq: yes, norpmlib" in rpm.spec.
|
|
||||||
if [ "${RPM_PACKAGE_NAME-}" = rpm ]; then
|
|
||||||
echo "${0##*/}: rpmlib.req disabled for rpm itself" >&2
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
while IFS=$'\t' read -r f t; do
|
|
||||||
case "$f" in
|
|
||||||
${RPM_BUILD_ROOT-}@RPMCONFIGDIR@/*.filetrigger) ;;
|
|
||||||
*) continue ;;
|
|
||||||
esac
|
|
||||||
echo "$f"
|
|
||||||
done
|
|
@ -1,15 +0,0 @@
|
|||||||
#!/bin/sh -efu
|
|
||||||
|
|
||||||
. @RPMCONFIGDIR@/functions
|
|
||||||
|
|
||||||
RpmlibReq()
|
|
||||||
{
|
|
||||||
local f="$1"; shift
|
|
||||||
case "$f" in
|
|
||||||
*.filetrigger)
|
|
||||||
echo 'rpmlib(PosttransFiletriggers)'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
ArgvFileAction RpmlibReq "$@"
|
|
Loading…
Reference in New Issue
Block a user