back to --with=!#:+ in --with handling etc

Changed files:
    rpm-rpmpopt.patch -> 1.10

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 16dfd860caf60f5b6b65a9b9cec74ed347de8bdf..cfd99c93110b67cc7c318f25573d9905c07a3c17 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,7 +1,7 @@
 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 @@
+@@ -80,6 +80,21 @@
  # Build policies enabled from command line. Last policy applies.
  rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
  
@@ -13,8 +13,10 @@ diff -Nru rpm-4.0/rpmpopt.in rpm-4.0.new/rpmpopt.in
 +
 +# Conditional building 
 +rpm exec  --bcond   find-spec-bcond
-+rpm alias --with    --define "_with_!#:+       1"
-+rpm alias --without --define "_without_!#:+       1"
++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
 +