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

[packages/rpm.git] / rpm-drop-legacy-CLI.patch

diff --git a/rpm-drop-legacy-CLI.patch b/rpm-drop-legacy-CLI.patch
index 2d2cc78031f37d1b9901332e071e02d70bd0b844..f8295aa16947ff7a6bb3f022478abb4fe2fb2e68 100644 (file)
--- a/rpm-drop-legacy-CLI.patch
+++ b/rpm-drop-legacy-CLI.patch
@@ -1,24 +1,58 @@
---- rpm-4.0.4/rpmpopt.in.wiget Fri Feb 15 09:45:59 2002
-+++ rpm-4.0.4/rpmpopt.in       Fri Feb 15 09:48:54 2002
-@@ -171,26 +171,26 @@
- rpm   exec --target           rpmb --target
- rpm   exec --short-circuit    rpmb --short-circuit
+--- 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 --initdb           rpmd --initdb
-+#rpm  exec --rebuilddb        rpmd --rebuilddb
-+#rpm  exec --verifydb         rpmd --verifydb
- 
- #rpm  exec -e                 rpme -e
- #rpm  exec --erase            rpme --erase
- #rpm  exec -U                 rpmu -U
- #rpm  exec --upgrade          rpmu --upgrade
- 
+-
 -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
@@ -27,9 +61,21 @@
 -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
@@ -38,22 +84,51 @@
 +#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" \
-@@ -213,6 +213,11 @@
- rpmb  alias --without         --define "_without_!#:+    --without-!#:+" \
-       --POPTdesc=$"disable configure <option> for build" \
-       --POPTargs=$"<option>"
++
++#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>"
++#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 <dir> as the directory for the database" \
-@@ -228,6 +233,11 @@
+       --POPTdesc=$"use database in DIRECTORY" \
+@@ -226,6 +231,11 @@
  rpmbuild alias --without      --define "_without_!#:+  --without-!#:+" \
        --POPTdesc=$"disable configure <option> for build" \
        --POPTargs=$"<option>"
@@ -64,4 +139,4 @@
 +
  #==============================================================================
  rpmd  alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use <dir> as the directory for the database" \
+       --POPTdesc=$"use database in DIRECTORY" \