- md5summized,

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

diff --git a/rpm-drop-legacy-CLI.patch b/rpm-drop-legacy-CLI.patch
index 2d2cc78031f37d1b9901332e071e02d70bd0b844..e3c0c957e4c035c69a5ca635ca41f1bc30b98824 100644 (file)
--- a/rpm-drop-legacy-CLI.patch
+++ b/rpm-drop-legacy-CLI.patch
@@ -1,59 +1,47 @@
---- 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.2/rpmpopt.in.wiget   Thu Mar 27 19:07:35 2003
++++ rpm-4.2/rpmpopt.in Thu Mar 27 19:07:36 2003
+@@ -105,31 +105,31 @@
+       --POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)"
  
--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
+ # 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 !#:+'
  
- #rpm  exec -e                 rpme -e
- #rpm  exec --erase            rpme --erase
- #rpm  exec -U                 rpmu -U
- #rpm  exec --upgrade          rpmu --upgrade
+ # 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>"
  
--rpm   exec --addsign          rpmk --addsign
--rpm   exec -K                 rpmk -K
--rpm   exec --checksig         rpmk --checksig
--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  exec --addsign          rpmk --addsign
-+#rpm  exec -K                 rpmk -K
-+#rpm  exec --checksig         rpmk --checksig
-+#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
+ # 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"
  
- 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>"
-+# 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 <dir> as the directory for the database" \
-@@ -228,6 +233,11 @@
+ # 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).
+@@ -247,6 +247,11 @@
  rpmbuild alias --without      --define "_without_!#:+  --without-!#:+" \
        --POPTdesc=$"disable configure <option> for build" \
        --POPTargs=$"<option>"
@@ -64,4 +52,4 @@
 +
  #==============================================================================
  rpmd  alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use <dir> as the directory for the database" \
+       --POPTdesc=$"use database in DIRECTORY" \