SOURCES (AC-branch): rpm-rpmpopt.patch - merged from HEAD

[baggins]

Author: baggins                      Date: Fri Jun 17 14:40:53 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   rpm-rpmpopt.patch (1.15 -> 1.15.4.1) 

---- Diffs:

================================================================
Index: SOURCES/rpm-rpmpopt.patch
diff -u SOURCES/rpm-rpmpopt.patch:1.15 SOURCES/rpm-rpmpopt.patch:1.15.4.1
--- SOURCES/rpm-rpmpopt.patch:1.15	Wed Jun 11 00:34:09 2003
+++ SOURCES/rpm-rpmpopt.patch	Fri Jun 17 16:40:47 2005
@@ -54,9 +54,9 @@
  #==============================================================================
  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 @@
+--- rpm/po/pl.po.orig	2005-01-16 21:16:12.259536368 +0100
++++ rpm/po/pl.po	2005-01-16 21:17:45.817313424 +0100
+@@ -4379,6 +4379,18 @@
  msgid "disable configure <option> for build"
  msgstr "wyłącz <opcję> konfiguracji przy budowaniu"
  
@@ -72,6 +72,6 @@
 +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:216 ../rpmpopt:231 ../rpmpopt:246 ../rpmpopt:254 ../rpmpopt:262
+ #: ../rpmpopt:270 ../rpmpopt:278 ../rpmpopt:286 ../rpmpopt:294 ../rpmpopt:389
+ #: ../rpmpopt:483 ../rpmpopt:491
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-rpmpopt.patch?r1=1.15&r2=1.15.4.1&f=u