--- ./popt/popt.3	Tue Dec  1 17:28:41 1998
+++ ../rpm-3.0.3/./popt/popt.3	Fri Nov 19 16:20:17 1999
@@ -118,7 +118,7 @@
 .sp
 .TS
 lfB lfB lfB
-lfB lfR lfR.
+lfB lfR lfR .
 Value	Description	arg Type
 POPT_ARG_NONE	No argument expected	int
 POPT_ARG_STRING	No type checking to be performed	char *
--- ./build/parsePrep.c	Mon Oct  4 14:09:51 1999
+++ ../rpm-3.0.3/./build/parsePrep.c	Fri Nov 19 15:44:22 1999
@@ -76,24 +76,28 @@
     }
 
     if (compressed) {
+        const char *patcher = rpmGetPath("%{__patch}", NULL);
 	const char *zipper = rpmGetPath(
 	    (compressed == COMPRESSED_BZIP2 ? "%{_bzip2bin}" : "%{_gzipbin}"),
 	    NULL);
 	sprintf(buf,
 		"echo \"Patch #%d:\"\n"
-		"%s -d < %s | patch -p%d %s -s\n"
+		"%s -d < %s | %s -p%d %s -s\n"
 		"STATUS=$?\n"
 		"if [ $STATUS -ne 0 ]; then\n"
 		"  exit $STATUS\n"
 		"fi",
 		c,
-		zipper,
+		zipper, patcher,
 		fn, strip, args);
+	xfree(patcher);
 	xfree(zipper);
     } else {
+        const char *patcher = rpmGetPath("%{__patch}", NULL);
 	sprintf(buf,
 		"echo \"Patch #%d:\"\n"
-		"patch -p%d %s -s < %s", c, strip, args, fn);
+		"%s -p%d %s -s < %s", c, patcher, strip, args, fn);
+	xfree(patcher);
     }
 
     xfree(fn);
--- ./configure.in	Thu Sep 30 17:25:29 1999
+++ ../rpm-3.0.3/./configure.in	Fri Nov 19 15:36:08 1999
@@ -172,7 +172,7 @@
 
     AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
     AC_MSG_CHECKING(old version of patch)
-    PATCHVERSION=`patch --version 2>&1`
+    PATCHVERSION=${PATCHVERSION-`$__PATCH --version 2>&1`}
 
     if test "$PATCHVERSION" = "Patch version 2.1"; then
 	AC_DEFINE(HAVE_OLDPATCH_21)
@@ -196,7 +196,7 @@
 }
 
 localdone=
-for dir in $prefix /usr/local
+for dir in ${STDDIRS-$prefix /usr/local}
 do
 	case $dir in
 	NONE|/usr)	continue;;
--- ./configure	Thu Sep 30 17:27:25 1999
+++ ../rpm-3.0.3/./configure	Fri Nov 19 16:16:03 1999
@@ -2828,7 +2828,7 @@
 
     echo $ac_n "checking old version of patch""... $ac_c" 1>&6
 echo "configure:2831: checking old version of patch" >&5
-    PATCHVERSION=`patch --version 2>&1`
+    PATCHVERSION=${PATCHVERSION-`$__PATCH --version 2>&1`}
 
     if test "$PATCHVERSION" = "Patch version 2.1"; then
 	cat >> confdefs.h <<\EOF
@@ -2960,7 +2960,7 @@
 }
 
 localdone=
-for dir in $prefix /usr/local
+for dir in ${STDDIRS-$prefix /usr/local}
 do
 	case $dir in
 	NONE|/usr)	continue;;