---- rpm-3.0.3/rpmpopt.wiget Fri Sep 24 03:50:04 1999
-+++ rpm-3.0.3/rpmpopt Tue Oct 19 16:56:16 1999
-@@ -72,3 +72,5 @@
+diff -Nru rpm-4.0/rpmpopt.in rpm-4.0.new/rpmpopt.in
+--- rpm-4.0/rpmpopt.in Wed Nov 15 19:18:35 2000
++++ rpm-4.0.new/rpmpopt.in Wed Nov 15 19:18:15 2000
+@@ -80,6 +80,19 @@
+ # Build policies enabled from command line. Last policy applies.
+ rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
- rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides
- rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires
-+
++# Make RPM build tree
+rpm exec --install-build-tree install-build-tree
++
++# Compiling with debuginfo may be enabled by --debug
++rpm alias --debug --define 'debug 1'
++
++# Conditional building
++rpm exec --bcond find-spec-bcond
++rpm alias --with --define "bcond_on_!#:+ 1"
++rpm alias --without --define "bcond_off_!#:+ 1"
++
++# Don't remove $BUILDROOT if --noclean
++
+ # Choose db interface:
+ # 0 same as 1
+ # 1 native db1 interface (e.g. linux glibc libdb1 routines).