diff --git a/configure.in b/configure.in index 7f17d0d..c3c9ca0 100644 --- a/configure.in +++ b/configure.in @@ -1016,8 +1016,6 @@ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/pam.req scripts/pkgconfig.req scripts/pkgconfiglib.req - scripts/rpmlib.req - scripts/rpmlib.req.files scripts/shebang.req scripts/shell.prov scripts/shell.req diff --git a/rpm-4_0.spec b/rpm-4_0.spec index 86a5548..6e13f12 100644 --- a/rpm-4_0.spec +++ b/rpm-4_0.spec @@ -506,7 +506,6 @@ fi %rpmattr %_rpmlibdir/pam.* %rpmattr %_rpmlibdir/pkgconfig.* %rpmattr %_rpmlibdir/pkgconfiglib.* -%rpmattr %_rpmlibdir/rpmlib.* %rpmattr %_rpmlibdir/shell.* %rpmattr %_rpmlibdir/shebang.* %rpmattr %_rpmlibdir/static.* diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 3af908f..8e31a6e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -18,7 +18,6 @@ EXTRA_DIST = \ 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 \ pkgconfig.req pkgconfiglib.req pkgconfig.req.files \ - rpmlib.req rpmlib.req.files \ rpmdiff rpmdiff.cgi rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ shebang.req shebang.req.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 \ pam.req pam.req.files pam.prov pam.prov.files perl.prov perl.req \ pkgconfig.req pkgconfiglib.req pkgconfig.req.files \ - rpmlib.req rpmlib.req.files \ rpmdiff rpmdiff.cgi rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ shebang.req shebang.req.files \ shell.req shell.req.files shell.prov shell.prov.files \ diff --git a/scripts/rpmlib.req.files.in b/scripts/rpmlib.req.files.in deleted file mode 100755 index f506e5e..0000000 --- a/scripts/rpmlib.req.files.in +++ /dev/null @@ -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 diff --git a/scripts/rpmlib.req.in b/scripts/rpmlib.req.in deleted file mode 100755 index c2d7aea..0000000 --- a/scripts/rpmlib.req.in +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -efu - -. @RPMCONFIGDIR@/functions - -RpmlibReq() -{ - local f="$1"; shift - case "$f" in - *.filetrigger) - echo 'rpmlib(PosttransFiletriggers)' - ;; - esac -} - -ArgvFileAction RpmlibReq "$@"