Permit building w/o libbz2.a.

In popt, check for building within the rpm tree before requiring GNU gettext.

CVS patchset: 3595
CVS date: 2000/02/27 23:40:36

diff --git a/aclocal.m4 b/aclocal.m4
index d59e8cb..56e7a82 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4a
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -21,8 +21,6 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
-dnl We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]

diff --git a/build/Makefile.am b/build/Makefile.am
index e0ac16b..2a0b4c5 100644 (file)
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -15,7 +15,7 @@ librpmbuild_la_SOURCES = \
        parseBuildInstallClean.c parseChangelog.c parseDescription.c \
        parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
        parseSpec.c reqprov.c spec.c
-librpmbuild_la_LIBADD = -lrpm -lpopt
+#librpmbuild_la_LIBADD = -lrpm -lpopt
 
 .PHONY:        lclint
 lclint:

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b8e564d..e6abb9c 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,7 +24,7 @@ librpm_la_SOURCES = \
        rebuilddb.c rpmchecksig.c rpmdb.c rpmerr.c rpminstall.c \
        rpmio.c rpmlead.c rpmmalloc.c rpmrc.c signature.c stringbuf.c stubs.c \
        tagName.c tagtable.c transaction.c uninstall.c url.c verify.c
-librpm_la_LIBADD = -lpopt
+#librpm_la_LIBADD = -lpopt
 
 tagtable.c: rpmlib.h 
        @echo '#include "system.h"' > tagtable.c

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 1df4f2c..4ec6c18 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -8,11 +8,11 @@ WriteMakefile(
              'OBJECT'  => 'rpm.o constant.o',
              'VERSION_FROM' => 'rpm.pm',               # finds $VERSION
              'MAKEFILE'=> 'PMakefile',
-             'LIBS'    => [' -L/usr/local/lib -R/usr/local/lib  -L/usr/ucblib -R/usr/ucblib  -lnsl -lsocket -ldb -lz -lbz2'],                  # e.g., '-lm' 
+             'LIBS'    => [' -L/usr/local/lib  -ldb1 -lz'],                    # e.g., '-lm' 
              'CCFLAGS' => '-g -O2 -D_GNU_SOURCE -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts',
              'OPTIMIZE'=> '-g',
              'DEFINE'  => '-Dbool=char -DHAS_BOOL',
-             'INC'     => ' -I/usr/local/include -I$(top_builddir)/misc -I../build -I../lib -I../popt -I/usr/include/rpm',
+             'INC'     => ' -I../build -I../lib -I../popt -I/usr/include/rpm',
              'depend'  => { 'rpm.c' => 'transaction.xs header.xs db.xs' },
 );
 

diff --git a/perl/Makefile.in b/perl/Makefile.in
index 9bb5ea4..f4cc7f2 100644 (file)
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,10 +48,9 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -172,7 +171,7 @@ DIST_COMMON =  README ChangeLog Makefile.PL.in Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -221,7 +220,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -250,7 +249,7 @@ uninstall: uninstall-am
 all-am: Makefile $(SCRIPTS)
 all-redirect: all-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
        $(mkinstalldirs)  $(DESTDIR)$(configdir)
 

diff --git a/po/cs.po b/po/cs.po
index 1a2b7b1..6bc8900 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -1885,53 +1885,53 @@ msgstr "Nelze 
 msgid "No patch number %d"
 msgstr "(není èíslo)"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Nelze èíst %s: %s."
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -3190,67 +3190,67 @@ msgstr "chyba: nelze otev
 msgid "Installing %s\n"
 msgstr "Probíhá instalace %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Bad server response"
 msgstr "Chybná odezva serveru FTP"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Server IO error"
 msgstr "V/V chyba FTP"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Server timeout"
 msgstr "Promlka serveru FTP"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Nelze vyhledat adresu hostitelského serveru FTP"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Nelze vyhledat název hostitelského serveru FTP"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "K serveru FTP se nelze pøipojit"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Se serverem FTP nelze navázat datové spojení"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "V/V chyba na místní soubor"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pøi nastavení vzdáleného serveru na pasivní re¾im"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Soubor nebyl na serveru nalezen"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neznámá nebo neèekaná chyba FTP"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "probíhá pøihla¹ování na %s jako %s, h. %s\n"

diff --git a/po/de.po b/po/de.po
index 73ded3a..0ca9c28 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -1981,54 +1981,54 @@ msgstr "Lesen von %s fehlgeschlagen: %s."
 msgid "No patch number %d"
 msgstr "(keine Zahl)"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
 # , c-format
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -3320,67 +3320,67 @@ msgstr "Fehler: kann %s nicht 
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Bad server response"
 msgstr "Nicht passende Antwort des FTP-Servers"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP IO-Fehler"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Server timeout"
 msgstr "Timeout des FTP-Servers"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Verbindung zum FTP-Server fehlgeschlagen"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "IO-Fehler bei lokaler Datei"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP Unbekannter oder nicht erwarteter Fehler"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index 4195553..bbbc3f7 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1923,53 +1923,53 @@ msgstr "En voi lukea %s: %s."
 msgid "No patch number %d"
 msgstr "(ei ole luku)"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "En voi lukea %s: %s."
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -3233,67 +3233,67 @@ msgstr "virhe: en voi avata %s\n"
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Bad server response"
 msgstr "Virheellinen FTP-palvelijan vastaus"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP:n IO-virhe"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP-palvelimen timeout"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP-palvelimen osoitetta ei löytynyt"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP-palvelimen nimeä ei löytynyt"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "En saanut yhteyttä FTP-palvelijaan"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "En saanut data-yhteyttä FTP-palvelijaan"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "Paikallisen tiedoston IO-virhe"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "Virhe asetettaessa palvelinta passiiviin moodiin"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP:n tuntematon tai odottamaton virhe"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""

diff --git a/po/fr.po b/po/fr.po
index 6c273ac..c9dab43 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-02-25 15:49-0500\n"
+msgstr "POT-Creation-Date: 2000-02-27 18:06-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -1926,53 +1926,53 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -3234,59 +3234,59 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Bad server response"
 msgstr ""
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Server IO error"
 msgstr ""
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Server timeout"
 msgstr ""
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Failed to connect to server"
 msgstr ""
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr ""
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr ""
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index 1f16e9a..5410722 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -193,7 +193,7 @@ msgstr "copyright 
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.25 2000/02/27 18:52:30 jbj Exp $
+# $Id: ja.po,v 1.26 2000/02/27 23:40:37 jbj Exp $
 #: rpm.c:199
 #, c-format
 msgid "rpm: %s\n"
@@ -1890,53 +1890,53 @@ msgstr "
 msgid "No patch number %d"
 msgstr "¥Ñ¥Ã¥ÁÈÖ¹æ %d ¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr "¥½¡¼¥¹ÈÖ¹æ %d ¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "nosource %s ¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr "%%setup ¤Î¹½Ê¸²òÀÏ¥¨¥é¡¼: %s"
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "%d ¹ÔÌÜ: %%setup %c ¤Ø¤ÎÉÔÀµ¤Ê°ú¿ô: %s"
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %%setup ¥ª¥×¥·¥ç¥ó %s: %s"
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "%d ¹ÔÌÜ: %%patch -b ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s"
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "%d ¹ÔÌÜ: %%patch -z ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s"
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "%d ¹ÔÌÜ: %%patch -p ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s"
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %%patch -p ¤Ø¤Î°ú¿ô: %s"
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr "¥Ñ¥Ã¥Á¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "%d ¹ÔÌÜ: %%patch ¤Ø¤ÎÉÔÀµ¤Ê°ú¿ô: %s"
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%%prep"
 
@@ -3213,67 +3213,67 @@ msgstr "%s 
 msgid "Installing %s\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr "À®¸ù"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Bad server response"
 msgstr "¥µ¡¼¥Ð¤«¤éÀµ¾ï¤Ê±þÅú¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Server IO error"
 msgstr "¥µ¡¼¥Ð IO ¥¨¥é¡¼"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Server timeout"
 msgstr "¥µ¡¼¥Ð¥¿¥¤¥à¥¢¥¦¥È"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È¥¢¥É¥ì¥¹¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "¥µ¡¼¥Ð¤È¤Î¥Ç¡¼¥¿¥³¥Í¥¯¥·¥ç¥ó¤Î³ÎΩ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î IO ¥¨¥é¡¼"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ð¤Î¥Ñ¥Ã¥·¥Ö¥â¡¼¥ÉÀßÄꥨ¥é¡¼"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "¥µ¡¼¥Ð¾å¤Ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr "½èÍýÃæ¤Î¥¢¥Ü¡¼¥È"
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "ÉÔÌÀ¤â¤·¤¯¤Ïͽ´ü¤»¤Ì¥¨¥é¡¼"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "%s ¤Ø %s pw %s ¤È¤·¤Æ¥í¥°¥¤¥óÃæ\n"

diff --git a/po/pl.po b/po/pl.po
index 744cc5a..f27652f 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1848,53 +1848,53 @@ msgstr "B
 msgid "No patch number %d"
 msgstr "Brak ³aty numer %d"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr "Brak ¼ród³a numer %d"
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr "B³±d przetwarzania %%setup: %s"
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "linia %d: B³êdny argument dla %%setup %c: %s"
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "linia %d: B³êdna opcja %%setup %s: %s"
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "linia %d: Wymagany argument dla %%patch -b: %s"
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "linia %d: Wymagany argument dla %%patch -z: %s"
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "linia %d: Wymagany argument dla %%patch -p: %s"
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "linia %d: B³êdny argument dla %%patch -p: %s"
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr "Zbyt wiele ³at!"
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "linia %d: B³êdny argument dla %%patch: %s"
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr "linia %d: druga sekcja %%prep"
 
@@ -3134,59 +3134,59 @@ msgstr "nie mo
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr "Sukces"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Bad server response"
 msgstr "B³êdna odpowied¼ serwera"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Server IO error"
 msgstr "B³±d WE/WY(IO) serwera"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Server timeout"
 msgstr "Przekroczony limit czasu serwera"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Unable to lookup server host address"
 msgstr "Nie mo¿na znale¼æ adresu serwera"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "Unable to lookup server host name"
 msgstr "Nie mo¿na znale¼æ nazwy serwera"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Failed to connect to server"
 msgstr "Po³±czenie z serwerem nie powiod³o siê"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "Failed to establish data connection to server"
 msgstr "Otwarcie transmisji danych z serwera nie powiod³o siê"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "B³±d WE/WY(IO) na lokalnym pliku"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "B³±d: ustawienie zdalnego serwera w tryb pasywny nie powiod³o siê"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Plik nie zosta³ znaleziony na serwerze"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr "Przerywanie ..."
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 msgid "Unknown or unexpected error"
 msgstr "Nieznany lub nieoczekiwany b³±d"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "logowanie do %s jako %s, has³o %s\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9c60dc7..6cb1457 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-02-25 15:49-0500\n"
+msgstr "POT-Creation-Date: 2000-02-27 18:06-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -1981,54 +1981,54 @@ msgstr "N
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
 # , c-format
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -3318,59 +3318,59 @@ msgstr "N
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Bad server response"
 msgstr ""
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Server IO error"
 msgstr ""
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Server timeout"
 msgstr ""
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Failed to connect to server"
 msgstr ""
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr ""
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr ""
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index 7bb7dfe..efc1677 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1781,53 +1781,53 @@ msgstr ""
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -3058,59 +3058,59 @@ msgstr ""
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Bad server response"
 msgstr ""
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Server IO error"
 msgstr ""
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Server timeout"
 msgstr ""
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Failed to connect to server"
 msgstr ""
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr ""
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr ""
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 13f1ede..073fdc1 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1856,53 +1856,53 @@ msgstr "
 msgid "No patch number %d"
 msgstr "îÅÔ ÐÁÔÞÁ ÎÏÍÅÒ %d"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr "îÅÔ ÉÓÈÏÄÎÉËÁ ÎÏÍÅÒ %d"
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "îÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ nosource %s: %s"
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr "ïÛÉÂËÁ ÒÁÚÂÏÒÁ %%setup: %s"
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%setup %c: %s"
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÁÑ ÏÐÃÉÑ %%setup %s: %s"
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -b ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s"
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -z ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s"
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -p ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s"
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch -p: %s"
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÁÔÞÅÊ!"
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch: %s"
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÊ %%prep"
 
@@ -3138,59 +3138,59 @@ msgstr "
 msgid "Installing %s\n"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÀ %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr "õÄÁÌÏÓØ"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Bad server response"
 msgstr "îÅ×ÅÒÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Server IO error"
 msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Server timeout"
 msgstr "ôÁÊÍÁÕÔ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Unable to lookup server host address"
 msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ IP-ÁÄÒÅÓ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "Unable to lookup server host name"
 msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Failed to connect to server"
 msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "Failed to establish data connection to server"
 msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ Ó ÓÅÒ×ÅÒÏÍ"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÌÏËÁÌØÎÙÊ ÆÁÊÌ"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÐÅÒÅ×ÏÄÅ ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ × ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr "ïÔÍÅÎÁ × ÐÒÏÃÅÓÓÅ"
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 msgid "Unknown or unexpected error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n"

diff --git a/po/sk.po b/po/sk.po
index 417c284..3171957 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -1859,53 +1859,53 @@ msgstr "Chybn
 msgid "No patch number %d"
 msgstr "Neexistuje patch èíslo %d"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr "Neexistuje zdroj èíslo %d"
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Nebolo mo¾né prenies» nie-zdroj %s: %s"
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr "Chyba pri analýze %%setup: %s"
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "riadok %d: Chybný argument pre %%setup %c: %s"
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "riadok %d: Chybná voµba pre %%setup %s: %s"
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "riadok %d: %%patch -b potrebuje argument: %s"
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "riadok %d: %%patch -z potrebuje argument: %s"
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "riadok %d: %%patch -p potrebuje argument: %s"
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "riadok %d: Chybný argument pre %%patch -p: %s"
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr "Priveµa záplat!"
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "riadok %d: Chybný argument pre %%patch: %s"
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr "riadok %d: druhý %%prep"
 
@@ -3142,59 +3142,59 @@ msgstr "nie je mo
 msgid "Installing %s\n"
 msgstr "In¹taluje sa %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr "Úspech"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Bad server response"
 msgstr "Chybná odpoveï servera"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Server IO error"
 msgstr "Chyba vstupu/výstupu servera"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Server timeout"
 msgstr "Prekroèenie èasového limitu servera"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Unable to lookup server host address"
 msgstr "Nie je mo¾né vyhµada» adresu servera"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "Unable to lookup server host name"
 msgstr "Nie je mo¾né vyhµada» názov servera"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Failed to connect to server"
 msgstr "Pripojenie k serveru zlyhalo"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "Failed to establish data connection to server"
 msgstr "Vytvorenie dátového spojenia k serveru zlyhalo"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "Chyba vstupu/výstupu lokálneho súboru"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pri nastavení vzdialeného servera do pasívneho re¾imu"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Súbor sa na serveri nenachádza"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr "Zru¹enie prebieha"
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 msgid "Unknown or unexpected error"
 msgstr "Neznáma alebo neoèakávaná chyba"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prihlasuje sa na %s ako %s, heslo %s\n"

diff --git a/po/sl.po b/po/sl.po
index beab7b1..68fc0b6 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.10 2000/02/27 18:52:31 jbj Exp $
+# $Id: sl.po,v 1.11 2000/02/27 23:40:38 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1838,53 +1838,53 @@ msgstr "Okvarjen izvor: %s: %s"
 msgid "No patch number %d"
 msgstr "Krparija ¹t. %d manjka"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr "Izvorna koda ¹t. %d manjka"
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Ni mo¾no nalo¾iti nosource %s: %s"
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr "Napaka pri razèlembi %%setup: %s"
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "vrstica %d: Okvarjen argument za %%setup %c: %s"
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "vrstica %d: Okvarjena izbira %%setup %s: %s"
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "vrstica %d: Manjkajoè argument za %%patch -b: %s"
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "vrstica %d: Manjkajoè argument za %%patch -z: %s"
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "vrstica %d: Manjkajoè argument za %%patch -p: %s"
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "vrstica %d: Okvarjen argument za %%patch -p: %s"
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr "Preveè krparij!"
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "vrstica %d: Okvarjen argument za %%patch: %s"
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr "vrstica %d: drugi %%prep"
 
@@ -3126,59 +3126,59 @@ msgstr "ni mo
 msgid "Installing %s\n"
 msgstr "Name¹èamo %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr "Uspe¹no"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Bad server response"
 msgstr "Okvarjen odziv stre¾nika"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Server IO error"
 msgstr "V/I napaka na stre¾niku"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Server timeout"
 msgstr "Potekel èas na stre¾niku"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Unable to lookup server host address"
 msgstr "Naslov stre¾nika ni ugotovljiv"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "Unable to lookup server host name"
 msgstr "Ime stre¾nika ni ugotovljivo"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Failed to connect to server"
 msgstr "Neuspe¹en poskus prikljuèitve na stre¾nik"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "Failed to establish data connection to server"
 msgstr "Neuspe¹na vzpostavitev podatkovne povezave s stre¾nikom"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "V/I napaka na lokalni datoteki"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "Napaka pri nastavitvi oddaljenega stre¾nika v pasivni naèin"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Datoteke ni mo¾no najti na stre¾niku"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr "Prekinitev v teku"
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 msgid "Unknown or unexpected error"
 msgstr "Neznana ali neprièakovana napaka"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prijava na %s kot %s, geslo %s\n"

diff --git a/po/sr.po b/po/sr.po
index e06bed8..e75fee6 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -1884,53 +1884,53 @@ msgstr "Neuspelo 
 msgid "No patch number %d"
 msgstr "(nije broj)"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -3193,67 +3193,67 @@ msgstr "gre
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Bad server response"
 msgstr "Lo¹ odgovor FTP servera"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Server IO error"
 msgstr "Ulazno/izlazna FTP gre¹ka"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Server timeout"
 msgstr "Tajm-aut FTP servera"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Ne mogu da odredim host adresu FTP servera"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Ne mogu da odredim ime FTP hosta"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Ne mogu da se pove¾em sa FTP serverom"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "Ulazno/izlazna gre¹ka kod lokalne datoteke"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "Gre¹ka kod stavljanja udaljenog servera u pasivni re¾im"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Datoteka nije pronaðena na serveru"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neoèekivana ili nepoznata FTP gre¹ka"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""

diff --git a/po/sv.po b/po/sv.po
index a62dfef..fc82e01 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish messages for RPM
 # Copyright © 1999 Free Software Foundation, Inc.
 # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.70 $
+# $Revision: 1.71 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: 2000-02-21 12:20+0100\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1829,53 +1829,53 @@ msgstr "D
 msgid "No patch number %d"
 msgstr "Inget patch-nummer %d"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr "Inget källkodsnummer %d"
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Kunde inte hämta nosource %s: %s"
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr "Fel i parsning av %%setup: %s"
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "rad %d: Felaktigt argument till %%setup %c: %s"
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "rad %d: Felaktig %%setup-flagga %s: %s"
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "rad %d: Behöver argument till %%patch -b: %s"
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "rad %d: Behöver argument till %%patch -z: %s"
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "rad %d: Behöver argument till %%patch -p: %s"
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "rad %d: Felaktigt argument till %%patch -p: %s"
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr "För många patchar!"
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "rad %d: Felaktigt argument till %%patch: %s"
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr "rad %d: andra %%prep"
 
@@ -3119,59 +3119,59 @@ msgstr "kan inte 
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr "Lyckades"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Bad server response"
 msgstr "Konstigt svar från server"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Server IO error"
 msgstr "IO-fel mot server"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Server timeout"
 msgstr "Förbindelsen med servern dog ut (timeout)"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Unable to lookup server host address"
 msgstr "Kunde inte slå upp serverns adress"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "Unable to lookup server host name"
 msgstr "Kunde inte slå upp serverns namn"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Failed to connect to server"
 msgstr "Misslyckades med att kontakta servern"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "Failed to establish data connection to server"
 msgstr "Misslyckades med att etablera en dataförbindelse till servern"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "IO-fel mot lokal fil"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "Fel när den fjärrservern sattes i passivt läge"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Filen fanns inte på servern"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr "Avbruten under gång"
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 msgid "Unknown or unexpected error"
 msgstr "Okänt eller oväntat fel"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "loggar in på %s som %s, lösenord %s\n"

diff --git a/po/tr.po b/po/tr.po
index b228934..e263795 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-25 15:49-0500\n"
+"POT-Creation-Date: 2000-02-27 18:06-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1921,53 +1921,53 @@ msgstr "%s okunamad
 msgid "No patch number %d"
 msgstr "(üye deðil)"
 
-#: build/parsePrep.c:138
+#: build/parsePrep.c:139
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:157
+#: build/parsePrep.c:158
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "%s okunamadý: %s"
 
-#: build/parsePrep.c:223
+#: build/parsePrep.c:224
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:238
+#: build/parsePrep.c:239
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:256
+#: build/parsePrep.c:257
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:383
+#: build/parsePrep.c:384
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:391
+#: build/parsePrep.c:392
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:403
+#: build/parsePrep.c:404
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:409
+#: build/parsePrep.c:410
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:416
+#: build/parsePrep.c:417
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:420
+#: build/parsePrep.c:421
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:457
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -3234,67 +3234,67 @@ msgstr "hata: %s eri
 msgid "Installing %s\n"
 msgstr "%s yükleniyor\n"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Bad server response"
 msgstr "FTP sunucusundan kötü yanýt"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP I/O hatasý"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP sunucusu zaman aþýmý"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP sunucusunun isim adres dönüþümü yapýlamadý"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP sunucusunun adres isim dönüþümü yapýlamadý"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "FTP sunucusuna baðlanýlamadý"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "FTP sunucusu ile veri alýþveriþi yapýlamadý"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "IO error to local file"
 msgstr "Yerel dosyaya eriþim sýrasýnda I/O hatasý"
 
-#: lib/rpmio.c:805
+#: lib/rpmio.c:807
 msgid "Error setting remote server to passive mode"
 msgstr "Karþý sunucuyu pasif kipe sokam hatasý"
 
-#: lib/rpmio.c:808
+#: lib/rpmio.c:810
 msgid "File not found on server"
 msgstr "Dosya sunucuda bulunamadý"
 
-#: lib/rpmio.c:811
+#: lib/rpmio.c:813
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:815
+#: lib/rpmio.c:817
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP bilinmeyen ya da beklenmeyen hata"
 
-#: lib/rpmio.c:1348
+#: lib/rpmio.c:1350
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""

diff --git a/popt/configure.in b/popt/configure.in
index 045094f..65fb526 100755 (executable)
--- a/popt/configure.in
+++ b/popt/configure.in
@@ -59,11 +59,14 @@ else
        AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING(for GNU xgettext)
-xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
-*** GNU gettext is required. The latest version
-*** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
-AC_MSG_RESULT(yes)
+if !test -f ../rpm.c
+then
+  AC_MSG_CHECKING(for GNU xgettext)
+  xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
+  *** GNU gettext is required. The latest version
+  *** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
+  AC_MSG_RESULT(yes)
+fi
 
 AC_CHECK_FUNCS(strerror mtrace)
 dnl AC_CHECK_FUNCS(gettext)

diff --git a/python/Makefile.in b/python/Makefile.in
index 083ee4c..12f9aef 100644 (file)
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,10 +48,9 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -197,7 +196,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/hash.P .deps/rpmmodule.P .deps/upgrade.P
 SOURCES = $(librpmmodule_la_SOURCES) $(rpmmodule_so_SOURCES)
@@ -272,8 +271,8 @@ install-pythonPROGRAMS: $(python_PROGRAMS)
        $(mkinstalldirs) $(DESTDIR)$(pythondir)
        @list='$(python_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+           echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
@@ -325,7 +324,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -386,7 +385,7 @@ uninstall: uninstall-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
 all-redirect: all-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
        $(mkinstalldirs)  $(DESTDIR)$(pythondir)
 

diff --git a/rpm.spec b/rpm.spec
index f3deb7f..a49cd39 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -94,11 +94,11 @@ make -C python
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_DIR/etc/rpm
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 %ifos linux
 make DESTDIR="$RPM_BUILD_ROOT" install -C python
+mkdir -p $RPM_BUILD_DIR/etc/rpm
 %endif
 
 { cd $RPM_BUILD_ROOT
@@ -134,7 +134,9 @@ fi
 %defattr(-,root,root)
 %doc RPM-PGP-KEY CHANGES GROUPS doc/manual/*
 /bin/rpm
+%ifos linux
 %dir /etc/rpm
+%endif
 /usr/bin/rpm2cpio
 /usr/bin/gendiff
 /usr/lib/librpm.so.*

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 2aabf18..4c3166d 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,10 +48,9 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -172,7 +171,7 @@ DIST_COMMON =  Makefile.am Makefile.in brp-redhat.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -221,7 +220,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -250,7 +249,7 @@ uninstall: uninstall-am
 all-am: Makefile $(SCRIPTS)
 all-redirect: all-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
        $(mkinstalldirs)  $(DESTDIR)$(configdir)
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 32278a6..58cbe74 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,12 +10,14 @@ EXTRA_DIST =        fstrcmp.c message.c str-list.c rpmchecksig.c
 
 EXTRA_PROGRAMS = rpmgettext rpmputtext rpminject
 
+myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
 # XXX should libtool generate dependent libs?
 myldadd= $(top_builddir)/build/librpmbuild.la \
        $(top_builddir)/lib/librpm.la \
        $(top_builddir)/popt/libpopt.la \
        @INTLLIBS@ @LIBMISC@
 
+LDFLAGS = $(myldflags)
 LDADD = $(myldadd)
 
 noinst_PROGRAMS = \