--- rpm-4.1/rpmpopt.in.wiget	Thu Sep 19 00:32:02 2002
+++ rpm-4.1/rpmpopt.in	Thu Sep 19 00:44:31 2002
@@ -93,31 +93,31 @@
 	--POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)"
 
 # colon separated i18n domains to use as PO catalogue lookaside for
-* retrieving header group/description/summary.
+# retrieving header group/description/summary.
 #
 # For Red Hat, value should be "redhat-dist:redhat-powertools".
 rpm alias --i18ndomains --define '_i18ndomains !#:+'
 
 # Build policies enabled from command line. Last policy applies.
-rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
-	--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
-	--POPTargs=$"<policy>"
+#rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
+#	--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
+#	--POPTargs=$"<policy>"
 
 # Make RPM build tree
-rpm exec --install-build-tree install-build-tree \
+rpmbuild exec --install-build-tree install-build-tree \
 	--POPTdesc=$"make all needed dirs for building binary rpms"
 
 # Compiling with debuginfo may be enabled by --debug
-rpm alias --debug --define 'debug 1' \
-	--POPTdesc=$"build packages with debug informations"
+#rpm alias --debug --define 'debug 1' \
+#	--POPTdesc=$"build packages with debug informations"
 rpmb alias --debug --define 'debug 1' \
 	--POPTdesc=$"build packages with debug informations"
 rpmbuild alias --debug --define 'debug 1' \
 	--POPTdesc=$"build packages with debug informations"
 
 # Conditional building 
-rpm exec  --bcond   find-spec-bcond \
-	--POPTdesc=$"find all --with/--without values"
+#rpm exec  --bcond   find-spec-bcond \
+#	--POPTdesc=$"find all --with/--without values"
 # Choose db interface:
 #	0	same as 1
 #	1	native db1 interface (e.g. linux glibc libdb1 routines).
@@ -173,44 +173,49 @@
 #rpm	exec --target		rpmb --target
 #rpm	exec --short-circuit	rpmb --short-circuit
 
-rpm	exec --initdb		rpmd --initdb
-rpm	exec --rebuilddb	rpmd --rebuilddb
-rpm	exec --verifydb		rpmd --verifydb
-
-rpm	exec --addsign		rpmk --addsign
-rpm	exec -K			rpmk -K
-rpm	exec --checksig		rpmk --checksig
-rpm	exec --import		rpmk --import
-rpm	exec --resign		rpmk --resign
-
-rpm	exec -q			rpmq -q
-rpm	exec --query		rpmq --query
-rpm	exec --querytags	rpmq --querytags
-rpm	exec -V			rpmv -V
-rpm	exec -y			rpmv -y
-rpm	exec --verify		rpmv --verify
-
-rpm	alias --with		--define "_with_!#:+       --with-!#:+" \
-	--POPTdesc=$"enable configure <option> for build" \
-	--POPTargs=$"<option>"
-rpm	alias --without		--define "_without_!#:+    --without-!#:+" \
-	--POPTdesc=$"disable configure <option> for build" \
-	--POPTargs=$"<option>"
+#rpm	exec --initdb		rpmd --initdb
+#rpm	exec --rebuilddb	rpmd --rebuilddb
+#rpm	exec --verifydb		rpmd --verifydb
+
+#rpm	exec --addsign		rpmk --addsign
+#rpm	exec -K			rpmk -K
+#rpm	exec --checksig		rpmk --checksig
+#rpm	exec --import		rpmk --import
+#rpm	exec --resign		rpmk --resign
+
+#rpm	exec -q			rpmq -q
+#rpm	exec --query		rpmq --query
+#rpm	exec --querytags	rpmq --querytags
+#rpm	exec -V			rpmv -V
+#rpm	exec -y			rpmv -y
+#rpm	exec --verify		rpmv --verify
+
+#rpm	alias --with		--define "_with_!#:+       --with-!#:+" \
+#	--POPTdesc=$"enable configure <option> for build" \
+#	--POPTargs=$"<option>"
+#rpm	alias --without		--define "_without_!#:+    --without-!#:+" \
+#	--POPTdesc=$"disable configure <option> for build" \
+#	--POPTargs=$"<option>"
 #==============================================================================
-rpmb	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use database in DIRECTORY" \
-	--POPTargs=$"DIRECTORY"
-rpmb	alias --ftpport		--define '_ftpport !#:+'
-rpmb	alias --ftpproxy	--define '_ftpproxy !#:+'
-rpmb	alias --httpport	--define '_httpport !#:+'
-rpmb	alias --httpproxy	--define '_httpproxy !#:+'
-rpmb	alias --timecheck	--define '_timecheck !#:+'
-rpmb	alias --with		--define "_with_!#:+       --with-!#:+" \
-	--POPTdesc=$"enable configure <option> for build" \
-	--POPTargs=$"<option>"
-rpmb	alias --without		--define "_without_!#:+    --without-!#:+" \
-	--POPTdesc=$"disable configure <option> for build" \
-	--POPTargs=$"<option>"
+#rpmb	alias --dbpath		--define '_dbpath !#:+' \
+#	--POPTdesc=$"use database in DIRECTORY" \
+#	--POPTargs=$"DIRECTORY"
+#rpmb	alias --ftpport		--define '_ftpport !#:+'
+#rpmb	alias --ftpproxy	--define '_ftpproxy !#:+'
+#rpmb	alias --httpport	--define '_httpport !#:+'
+#rpmb	alias --httpproxy	--define '_httpproxy !#:+'
+#rpmb	alias --timecheck	--define '_timecheck !#:+'
+#rpmb	alias --with		--define "_with_!#:+       --with-!#:+" \
+#	--POPTdesc=$"enable configure <option> for build" \
+#	--POPTargs=$"<option>"
+#rpmb	alias --without		--define "_without_!#:+    --without-!#:+" \
+#	--POPTdesc=$"disable configure <option> for build" \
+#	--POPTargs=$"<option>"
+# Build policies enabled from command line. Last policy applies.
+#rpmb alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
+#	--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
+#	--POPTargs=$"<policy>"
+
 #==============================================================================
 rpmbuild	alias --dbpath		--define '_dbpath !#:+' \
 	--POPTdesc=$"use database in DIRECTORY" \
@@ -226,6 +231,11 @@
 rpmbuild alias --without	--define "_without_!#:+  --without-!#:+" \
 	--POPTdesc=$"disable configure <option> for build" \
 	--POPTargs=$"<option>"
+# Build policies enabled from command line. Last policy applies.
+rpmbuild alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
+	--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
+	--POPTargs=$"<policy>"
+
 #==============================================================================
 rpmd	alias --dbpath		--define '_dbpath !#:+' \
 	--POPTdesc=$"use database in DIRECTORY" \