- merged 4.1 patches... hope I didn't brake anything

[packages/rpm.git] / rpm-rpmpopt.patch

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index cfd99c93110b67cc7c318f25573d9905c07a3c17..b2933d9740a1fea7ba6bbc1ab82f4496051875cf 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -6,20 +6,20 @@ diff -Nru rpm-4.0/rpmpopt.in rpm-4.0.new/rpmpopt.in
  rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
  
 +# Make RPM build tree
-+rpm exec --install-build-tree install-build-tree
++rpm 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'
++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
-+rpm alias --with    --define "_with_!#:+       --with-!#:+"
-+rpm alias --without --define "_without_!#:+       --without-!#:+"
-+rpmb alias --with    --define "_with_!#:+       --with-!#:+"
-+rpmb alias --without --define "_without_!#:+       --without-!#:+"
-+
-+# Don't remove $BUILDROOT if --noclean
-+
++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).