- ported to 4.4.9

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

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index cd9345ac4352c8714dcd5efa6e7159b95ea43ffa..f55f4bd3c8f234a90f56be54009776b4f3342b26 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,14 +1,5 @@
---- rpm-4.4.3/rpmpopt.in.orig  2005-10-30 02:15:44.000000000 +0200
-+++ rpm-4.4.3/rpmpopt.in       2005-11-18 22:43:57.809703712 +0100
-@@ -134,7 +134,7 @@
-       --POPTdesc=$"Failed transactions will be rolled back automatically"
- 
- # colon separated i18n domains to use as PO catalogue lookaside for
--* retrieving header group/description/summary.
-+# retrieving header group/description/summary.
- #
- # For vendors, value should be "vendor-dist".
- rpm alias --i18ndomains --define '_i18ndomains !#:+'
+--- 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" \
@@ -26,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"
@@ -41,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.9/po/pl.po.orig    2007-05-22 01:10:34.875893544 +0200
++++ rpm-4.4.9/po/pl.po 2007-05-22 08:08:41.253484731 +0200
+@@ -4509,6 +4509,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
+ #: rpmpopt:262 rpmpopt:277 rpmpopt:295 rpmpopt:303
+ #: rpmpopt:311 rpmpopt:319 rpmpopt:327 rpmpopt:335
+ #: rpmpopt:343 rpmpopt:454 rpmpopt:564 rpmpopt:572