rename FORCE_RPMRC_GNU->APPEND_TARGET_ABI to better express intention

[packages/rpm.git] / rpm-popt-aliases.patch

diff --git a/rpm-popt-aliases.patch b/rpm-popt-aliases.patch
index 001b73f507a67048cf788efead5dc04eb9959af1..8166b08600931a174c0de50c2cabc1d8fc8b154d 100644 (file)
--- a/rpm-popt-aliases.patch
+++ b/rpm-popt-aliases.patch
@@ -1,9 +1,9 @@
 --- rpm-4.4.9/rpmpopt.in       2008-03-24 22:09:33.709972364 +0200
 +++ rpm-4.4.9/rpmpopt.in       2008-04-04 18:51:45.658923774 +0300
-@@ -240,6 +249,18 @@
-       --POPTdesc=$"override build root" \
-       --POPTargs=$"DIRECTORY"
- 
+@@ -240,5 +246,39 @@
+       --POPTdesc=$"trace macro expansion"
+ rpmspec alias --nodebuginfo   --define 'debug_package %{nil}' \
+       --POPTdesc=$"do not generate debuginfo for this package"
 +# (PLD-specific) Make RPM build tree
 +rpmbuild exec --install-build-tree install-build-tree \
 +      --POPTdesc=$"make all needed dirs for building binary rpms"
@@ -16,12 +16,13 @@
 +rpmbuild exec  --bcond find-spec-bcond \
 +      --POPTdesc=$"find all --with/--without values"
 +
- rpmbuild alias --lsb --noautoreq --noautoprov \
-       --define '_use_internal_dependency_generator 0' \
-       --notinlsb
-@@ -595,4 +595,22 @@
- rpmv  alias --httpproxy       --define '_httpproxy !#:+'
- 
++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   alias --initdb  -qa --quiet \
 +      --POPTdesc=$"Compatibility option with old rpm. Database is created lazily now."
 +
@@ -34,9 +35,6 @@
 +rpm alias --what-requires --whatrequires \
 +      --POPTdesc=$"find package name that contains a required capability"
 +
-+rpm alias --norepackage --define '_repackage_all_erasures 0' \
-+      --POPTdesc=$"Disable re-package of the files before erasing"
-+
 +rpmbuild alias --disable-debuginfo --define '_enable_debug_packages 0' \
 +   --POPTdesc=$"Disable debuginfo package creation"
 +