-diff -urN rpm-3.0.5.orig/configure.in rpm-3.0.5/configure.in
---- rpm-3.0.5.orig/configure.in Sun Jul 30 00:05:48 2000
-+++ rpm-3.0.5/configure.in Sun Jul 30 00:07:06 2000
-@@ -181,6 +181,7 @@
+diff -Nru rpm-4.0.1/configure.in rpm-4.0.1.new/configure.in
+--- rpm-4.0.1/configure.in Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/configure.in Wed Jan 31 13:49:25 2001
+@@ -185,6 +185,7 @@
AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
AC_MSG_CHECKING(old version of patch)
PATCHVERSION=`patch --version 2>&1`
-@@ -913,7 +914,8 @@
- dnl export LIBS INCPATH CONFIG_SITE
+@@ -1043,6 +1044,7 @@
AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat
-+AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt
-+ scripts/brp-redhat macros.perl scripts/perl.req scripts/perl.prov
- lib/Makefile build/Makefile tools/Makefile scripts/Makefile
+ AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt rpm.spec scripts/brp-redhat
++ macros.perl scripts/perl.req scripts/perl.prov
+ rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
+ scripts/Makefile
tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
- misc/Makefile po/Makefile.in intl/Makefile
-diff -urN rpm-3.0.5.orig/macros.in rpm-3.0.5/macros.in
---- rpm-3.0.5.orig/macros.in Sun Jul 30 00:05:48 2000
-+++ rpm-3.0.5/macros.in Sun Jul 30 00:07:06 2000
-@@ -569,9 +569,11 @@
+diff -Nru rpm-4.0.1/macros.in rpm-4.0.1.new/macros.in
+--- rpm-4.0.1/macros.in Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/macros.in Wed Jan 31 13:38:04 2001
+@@ -629,9 +629,11 @@
# %{perl_sitearch}/Image
# %dir %{perl_sitearch}/auto/Image
#
#------------------------------------------------------------------------------
# arch macro for all Intel i?86 compatibile processors
-diff -urN rpm-3.0.5.orig/macros.perl.in rpm-3.0.5/macros.perl.in
---- rpm-3.0.5.orig/macros.perl.in Thu Jan 1 01:00:00 1970
-+++ rpm-3.0.5/macros.perl.in Sun Jul 30 00:07:06 2000
-@@ -0,0 +1,12 @@
-+# Perl specific macro definitions.
-+# To make use of these macros insert the following line into your spec file:
-+# %include @RPMCONFIGDIR@/macros.perl
-+
-+%define __find_requires @RPMCONFIGDIR@/find-perl-requires
-+%define __find_provides @RPMCONFIGDIR@/find-perl-provides
-+
-+%define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib)
-+%define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
-+%define perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
-+%define perl_privlib %(eval "`perl -V:installprivlib`"; echo $installprivlib)
-+
-diff -urN rpm-3.0.5.orig/scripts/Makefile.am rpm-3.0.5/scripts/Makefile.am
---- rpm-3.0.5.orig/scripts/Makefile.am Sun Jul 9 17:36:20 2000
-+++ rpm-3.0.5/scripts/Makefile.am Sun Jul 30 00:07:51 2000
-@@ -8,7 +8,8 @@
+diff -Nru rpm-4.0.1/scripts/Makefile.am rpm-4.0.1.new/scripts/Makefile.am
+--- rpm-4.0.1/scripts/Makefile.am Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/scripts/Makefile.am Wed Jan 31 14:27:28 2001
+@@ -9,7 +9,8 @@
find-prov.pl find-req.pl cpanflute find-provides.perl \
find-requires.perl get_magic.pl getpo.sh http.req \
- magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
-- vpkg-provides.sh vpkg-provides2.sh
-+ vpkg-provides.sh vpkg-provides2.sh \
+ magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
+- trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh
++ trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh \
+ find-perl-requires find-perl-provides
installprefix = $(DESTDIR)
-@@ -21,4 +22,5 @@
+@@ -23,4 +24,5 @@
find-prov.pl find-req.pl cpanflute find-provides.perl \
find-requires.perl get_magic.pl getpo.sh http.req \
magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
- vpkg-provides.sh vpkg-provides2.sh
+ vpkg-provides.sh vpkg-provides2.sh \
+ find-perl-requires find-perl-provides
-diff -urN rpm-3.0.5.orig/scripts/find-perl-provides rpm-3.0.5/scripts/find-perl-provides
---- rpm-3.0.5.orig/scripts/find-perl-provides Thu Jan 1 01:00:00 1970
-+++ rpm-3.0.5/scripts/find-perl-provides Sun Jul 30 00:07:06 2000
-@@ -0,0 +1,8 @@
-+#!/bin/sh
-+ulimit -c 0
-+
-+filelist=`sed "s/['\"]/\\\&/g"`
-+
-+echo $filelist|/usr/lib/rpm/find-provides
-+/usr/lib/rpm/perl.prov $filelist
-+
-diff -urN rpm-3.0.5.orig/scripts/find-perl-requires rpm-3.0.5/scripts/find-perl-requires
---- rpm-3.0.5.orig/scripts/find-perl-requires Thu Jan 1 01:00:00 1970
-+++ rpm-3.0.5/scripts/find-perl-requires Sun Jul 30 00:07:06 2000
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+ulimit -c 0
-+
-+filelist=`sed "s/['\"]/\\\&/g"`
-+
-+requires="`echo $filelist|/usr/lib/rpm/find-requires`"
-+requires_perl="`/usr/lib/rpm/perl.req $filelist`"
-+requires_mod="`rpm -q --whatprovides --qf "%{NAME}\n" $requires_perl 2>/dev/null`"
-+echo "$requires
-+$requires_perl
-+$requires_mod"| sort -u
-diff -urN rpm-3.0.5.orig/scripts/perl.prov rpm-3.0.5/scripts/perl.prov
---- rpm-3.0.5.orig/scripts/perl.prov Wed Jun 14 14:34:50 2000
-+++ rpm-3.0.5/scripts/perl.prov Sun Jul 30 00:07:06 2000
+diff -Nru rpm-4.0.1/scripts/perl.prov rpm-4.0.1.new/scripts/perl.prov
+--- rpm-4.0.1/scripts/perl.prov Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/scripts/perl.prov Wed Jan 31 13:38:04 2001
@@ -47,7 +47,9 @@
if ("@ARGV") {
}
}
-diff -urN rpm-3.0.5.orig/scripts/perl.req rpm-3.0.5/scripts/perl.req
---- rpm-3.0.5.orig/scripts/perl.req Wed Jun 14 14:34:50 2000
-+++ rpm-3.0.5/scripts/perl.req Sun Jul 30 00:07:06 2000
+diff -Nru rpm-4.0.1/scripts/perl.req rpm-4.0.1.new/scripts/perl.req
+--- rpm-4.0.1/scripts/perl.req Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/scripts/perl.req Wed Jan 31 13:38:04 2001
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@