- updated for 4.4.9 (but probably not needed at all)

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

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index bf8d6afd2b4de4510dfffabcc51fecebc0d25002..1ce68994b8fc84bab6bfa37ee012187612aff18c 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -17,9 +17,9 @@
  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>"
+ rpmbuild alias --buildroot      --define '.buildroot !#:+' \
+       --POPTdesc=$"override build root" \
+       --POPTargs=$"DIRECTORY"
 +# (PLD-specific) Make RPM build tree
 +rpmbuild exec --install-build-tree install-build-tree \
 +      --POPTdesc=$"make all needed dirs for building binary rpms"
@@ -32,24 +32,24 @@
  #==============================================================================
  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 @@
+--- rpm-4.4.8/po/pl.po.orig    2007-04-08 15:56:32.413593481 +0200
++++ rpm-4.4.8/po/pl.po 2007-04-08 15:57:53.630221753 +0200
+@@ -4588,6 +4588,18 @@
  msgid "disable configure <option> for build"
  msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
  
-+#: ../rpmpopt:251
++#: rpmpopt:251
 +msgid "make all needed dirs for building binary rpms"
 +msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
 +
-+#: ../rpmpopt:254
++#: rpmpopt:254
 +msgid "build packages with debug information"
 +msgstr "buduj pakiety z informacjami do odpluskwiania"
 +
-+#: ../rpmpopt:257
++#: rpmpopt:257
 +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
+ #~ msgid "use database in DIRECTORY"
+ #~ msgstr "u¿yj bazy danych w KATALOGu"
+