- release 1.7 (debuginfo fixes).

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

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 5614cf90f8422fac6efe4c94480208da07db183d..bf8d6afd2b4de4510dfffabcc51fecebc0d25002 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,41 +1,55 @@
-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-!#:+'
- 
-+# Make RPM build tree
-+rpm exec --install-build-tree install-build-tree \
+--- rpm-4.4.4/rpmpopt.in.orig  2005-10-30 02:15:44.000000000 +0200
++++ rpm-4.4.4/rpmpopt.in       2005-11-18 22:43:57.809703712 +0100
+@@ -246,6 +246,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"
-+
-+# Compiling with debuginfo may be enabled by --debug
-+rpm alias --debug --define 'debug 1' \
-+      --POPTdesc=$"build packages with debug informations"
-+rpmb alias --debug --define 'debug 1' \
-+      --POPTdesc=$"build packages with debug informations"
++# (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" \
+@@ -261,6 +270,15 @@
+ 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 informations"
-+
-+# Conditional building 
-+rpm exec  --bcond   find-spec-bcond \
++      --POPTdesc=$"build packages with debug information"
++# (PLD-specific) Conditional building
++rpmbuild 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).
---- rpm-4.1/po/pl.po.orig      Wed Oct 23 23:01:03 2002
-+++ rpm-4.1/po/pl.po   Wed Oct 23 23:11:20 2002
-@@ -3789,4 +3789,13 @@
- #: ../rpmpopt:410 ../rpmpopt:418
- msgid "DIRECTORY"
- msgstr "KATALOG"
-+
+ #==============================================================================
+ rpmd  alias --dbpath          --define '_dbpath !#:+' \
+       --POPTdesc=$"use database in DIRECTORY" \
+--- rpm-4.4.2/po/pl.po.orig    2005-07-23 14:59:24.279380584 +0200
++++ rpm-4.4.2/po/pl.po 2005-07-23 15:08:13.952857976 +0200
+@@ -4387,6 +4387,18 @@
+ msgid "disable configure <option> for build"
+ msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
+ 
++#: ../rpmpopt:251
 +msgid "make all needed dirs for building binary rpms"
-+msgstr "utwórz wszystkie katalogi potrzebne do budowania pakietów RPM"
++msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
 +
-+msgid "build packages with debug informations"
++#: ../rpmpopt:254
++msgid "build packages with debug information"
 +msgstr "buduj pakiety z informacjami do odpluskwiania"
 +
++#: ../rpmpopt:257
 +msgid "find all --with/--without values"
-+msgstr "znajd¼ wszystkie u¿ywane --with/--without"
- 
++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