- uncommented patches commented by accident

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

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index cfd99c93110b67cc7c318f25573d9905c07a3c17..d965c27d40335714bdbff2a59fdc8bd203b3377a 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,25 +1,77 @@
-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,21 @@
- # Build policies enabled from command line. Last policy applies.
- rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
+--- rpm-4.3/rpmpopt.in.orig    2003-02-06 19:02:50.000000000 +0100
++++ rpm-4.3/rpmpopt.in 2003-06-10 23:55:22.000000000 +0200
+@@ -105,16 +105,11 @@
+       --POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)"
  
-+# Make RPM build tree
-+rpm exec --install-build-tree install-build-tree
-+
-+# Compiling with debuginfo may be enabled by --debug
-+rpm alias --debug --define 'debug 1'
-+
-+# 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
-+
+ # 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>"
+-
  # Choose db interface:
  #     0       same as 1
  #     1       native db1 interface (e.g. linux glibc libdb1 routines).
+@@ -217,6 +212,15 @@
+ rpmb  alias --without         --define "_without_!#:+    --without-!#:+" \
+       --POPTdesc=$"disable configure <option> for build" \
+       --POPTargs=$"<option>"
++# (PLD-specific) Make RPM build tree
++rpmb  exec --install-build-tree install-build-tree \
++      --POPTdesc=$"make all needed dirs for building binary rpms"
++# (PLD-specific) Compiling with debuginfo may be enabled by --debug
++rpmb  alias --debug --define 'debug 1' \
++      --POPTdesc=$"build packages with debug information"
++# (PLD-specific) Conditional building
++rpmb  exec  --bcond find-spec-bcond \
++      --POPTdesc=$"find all --with/--without values"
+ #==============================================================================
+ rpmbuild      alias --dbpath          --define '_dbpath !#:+' \
+       --POPTdesc=$"use database in DIRECTORY" \
+@@ -232,6 +236,19 @@
+ rpmbuild alias --without      --define "_without_!#:+  --without-!#:+" \
+       --POPTdesc=$"disable configure <option> for build" \
+       --POPTargs=$"<option>"
++# (PLD-specific) Make RPM build tree
++rpmbuild exec --install-build-tree install-build-tree \
++      --POPTdesc=$"make all needed dirs for building binary rpms"
++# (PLD-specific) Compiling with debuginfo may be enabled by --debug
++rpmbuild alias --debug --define 'debug 1' \
++      --POPTdesc=$"build packages with debug information"
++# (PLD-specific) Conditional building
++rpmbuild exec  --bcond find-spec-bcond \
++      --POPTdesc=$"find all --with/--without values"
++# Build policies enabled from command line. Last policy applies.
++#rpmbuild alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
++#     --POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
++#     --POPTargs=$"<policy>"
+ #==============================================================================
+ rpmd  alias --dbpath          --define '_dbpath !#:+' \
+       --POPTdesc=$"use database in DIRECTORY" \
+--- rpm-4.3/po/pl.po.orig      2003-06-10 23:48:19.000000000 +0200
++++ rpm-4.3/po/pl.po   2003-06-10 23:59:11.000000000 +0200
+@@ -3791,6 +3791,18 @@
+ msgid "disable configure <option> for build"
+ msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
+ 
++#: ../rpmpopt:217
++msgid "make all needed dirs for building binary rpms"
++msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
++
++#: ../rpmpopt:220
++msgid "build packages with debug information"
++msgstr "buduj pakiety z informacjami do odpluskwiania"
++
++#: ../rpmpopt:223
++msgid "find all --with/--without values"
++msgstr "znajd¼ wszystkie warto¶ci --with/--without"
++
+ #: ../rpmpopt:186 ../rpmpopt:201 ../rpmpopt:216 ../rpmpopt:224 ../rpmpopt:232
+ #: ../rpmpopt:240 ../rpmpopt:248 ../rpmpopt:256 ../rpmpopt:264 ../rpmpopt:337
+ #: ../rpmpopt:409 ../rpmpopt:417