- updated

Changed files:
    rpm-compress-doc.patch -> 1.7
    rpm-rpmpopt.patch -> 1.26

diff --git a/rpm-compress-doc.patch b/rpm-compress-doc.patch
index dcb2ecb31b13d7f76845696bbfccf68ce4ebb9a2..dacf20daedc68e5f86b0e449356bd59490c6470b 100644 (file)
--- a/rpm-compress-doc.patch
+++ b/rpm-compress-doc.patch
@@ -17,16 +17,17 @@
        }
      }
  
-diff -ur rpm-4.0.4/platform.in rpm-4.0.4-/platform.in
---- rpm-4.0.4/platform.in      Fri May 17 11:18:12 2002
-+++ rpm-4.0.4-/platform.in     Fri May 17 11:17:44 2002
-@@ -102,6 +102,9 @@
-     %{__os_install_post}\
- %{nil}
+diff -ur rpm-4.0.4/macros.in rpm-4.0.4-/macros.in
+--- rpm-4.0.4/macros.in        Fri May 17 11:18:12 2002
++++ rpm-4.0.4-/macros.in       Fri May 17 11:17:44 2002
+@@ -1208,6 +1208,9 @@
+ #%__spec_triggerin_pre                %{nil}
+ #%__spec_triggerin_post               %{nil}
  
 +# Executed at after copying %doc to DOCDIR, with $DOCDIR set
-+%__compress_doc               @prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
++%__compress_doc                @prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
 +
- @redhat@#---------------------------------------------------------------------
- @redhat@#     Expanded at end of %prep
- @redhat@#
+ #==============================================================================
+ # ---- configure macros.
+ #     Macro(s) slavishly copied from autoconf's config.status.
+

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index f55f4bd3c8f234a90f56be54009776b4f3342b26..31d00aac2d97fa1dcfafc4130f8602d8686dfdcd 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -221,6 +221,15 @@
  rpmb  alias --without         --define "_without_!#:+    --without-!#:+" \
        --POPTdesc=$"disable configure <option> for build" \
        --POPTargs=$"<option>"
@@ -16,10 +16,10 @@
  #==============================================================================
  rpmbuild      alias --dbpath          --define '_dbpath !#:+' \
        --POPTdesc=$"use database in DIRECTORY" \
-@@ -261,6 +270,15 @@
- rpmbuild alias --buildroot      --define '.buildroot !#:+' \
+@@ -240,5 +249,15 @@
        --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"
@@ -29,27 +29,27 @@
 +# (PLD-specific) Conditional building
 +rpmbuild exec  --bcond find-spec-bcond \
 +      --POPTdesc=$"find all --with/--without values"
- #==============================================================================
- rpmd  alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
---- 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
-+msgid "make all needed dirs for building binary rpms"
-+msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
-+
-+#: 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 warto¶ci --with/--without"
 +
- #: rpmpopt:262 rpmpopt:277 rpmpopt:295 rpmpopt:303
- #: rpmpopt:311 rpmpopt:319 rpmpopt:327 rpmpopt:335
- #: rpmpopt:343 rpmpopt:454 rpmpopt:564 rpmpopt:572
+ # \endverbatim
+ #*/
+;--- 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
+;+msgid "make all needed dirs for building binary rpms"
+;+msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
+;+
+;+#: 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 warto¶ci --with/--without"
+;+
+; #: rpmpopt:262 rpmpopt:277 rpmpopt:295 rpmpopt:303
+; #: rpmpopt:311 rpmpopt:319 rpmpopt:327 rpmpopt:335
+; #: rpmpopt:343 rpmpopt:454 rpmpopt:564 rpmpopt:572