From 9c636fed5b7e038315b77114b1ba9e46051351f4 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 8 May 2001 00:03:14 +0000 Subject: [PATCH] - create rpmdb.la so that linkage against rpm's db-3.2.9 is possible. CVS patchset: 4752 CVS date: 2001/05/08 00:03:14 --- .lclintrc | 2 +- CHANGES | 3 +- Doxyfile.in | 16 +- Makefile.am | 31 +- build/Makefile.am | 13 +- configure.in | 19 +- db3/.cvsignore | 24 + db3/configure | 4 +- lib/Makefile.am | 45 +- lib/problems.c | 2 +- lib/rpmlib.h | 11 +- lib/rpmrc.c | 2 +- po/POTFILES.in | 12 +- po/rpm.pot | 1248 ++++++++++++++++++++++----------------------- python/Makefile.am | 19 +- python/Makefile.in | 8 +- rpm.spec.in | 7 +- rpmdb/.cvsignore | 7 + rpmdb/Makefile.am | 87 ++++ {lib => rpmdb}/db1.c | 0 {lib => rpmdb}/db2.c | 0 {lib => rpmdb}/db3.c | 0 {lib => rpmdb}/dbconfig.c | 0 {lib => rpmdb}/falloc.c | 0 {lib => rpmdb}/falloc.h | 0 {lib => rpmdb}/rpmdb.c | 0 {lib => rpmdb}/rpmdb.h | 0 rpmpopt.in | 14 +- tools/Makefile.am | 17 +- 29 files changed, 861 insertions(+), 730 deletions(-) create mode 100644 db3/.cvsignore create mode 100644 rpmdb/.cvsignore create mode 100644 rpmdb/Makefile.am rename {lib => rpmdb}/db1.c (100%) rename {lib => rpmdb}/db2.c (100%) rename {lib => rpmdb}/db3.c (100%) rename {lib => rpmdb}/dbconfig.c (100%) rename {lib => rpmdb}/falloc.c (100%) rename {lib => rpmdb}/falloc.h (100%) rename {lib => rpmdb}/rpmdb.c (100%) rename {lib => rpmdb}/rpmdb.h (100%) diff --git a/.lclintrc b/.lclintrc index 10c1eec..ab0bbbb 100644 --- a/.lclintrc +++ b/.lclintrc @@ -1,4 +1,4 @@ --I. -I./build -I./lib -I./rpmio -I./popt -DHAVE_CONFIG_H -D_GNU_SOURCE +-I. -I./build -I./lib -I./rpmdb -I./rpmio -I./popt -DHAVE_CONFIG_H -D_GNU_SOURCE #+partial diff --git a/CHANGES b/CHANGES index 0e54b3f..73f0a9d 100644 --- a/CHANGES +++ b/CHANGES @@ -46,7 +46,8 @@ - fix: debugging message displays header keys (#38454). - fix: specfile queries with BuildArch: (#27589). - use internal db-3.2.9 sources to build by default. - - don't build db1 by default. + - don't build db1 support by default. + - create rpmdb.la so that linkage against rpm's db-3.2.9 is possible. 4.0 -> 4.0.[12] - add doxygen and lclint annotations most everywhere. diff --git a/Doxyfile.in b/Doxyfile.in index 7ab2489..2e4cbf0 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -353,14 +353,8 @@ INPUT = \ ./doc/manual/tsort \ ./lib/cpio.c \ ./lib/cpio.h \ - ./lib/db1.c \ - ./lib/db2.c \ - ./lib/db3.c \ - ./lib/dbconfig.c \ ./lib/depends.c \ ./lib/depends.h \ - ./lib/falloc.c \ - ./lib/falloc.h \ ./lib/formats.c \ ./lib/fprint.c \ ./lib/fprint.h \ @@ -386,8 +380,6 @@ INPUT = \ ./lib/psm.h \ ./lib/query.c \ ./lib/rpmchecksig.c \ - ./lib/rpmdb.c \ - ./lib/rpmdb.h \ ./lib/rpminstall.c \ ./lib/rpmlead.c \ ./lib/rpmlead.h \ @@ -402,6 +394,14 @@ INPUT = \ ./lib/tagtable.c \ ./lib/transaction.c \ ./lib/verify.c \ + ./rpmdb/db1.c \ + ./rpmdb/db2.c \ + ./rpmdb/db3.c \ + ./rpmdb/dbconfig.c \ + ./rpmdb/falloc.c \ + ./rpmdb/falloc.h \ + ./rpmdb/rpmdb.c \ + ./rpmdb/rpmdb.h \ ./rpmio/base64.c \ ./rpmio/base64.h \ ./rpmio/digest.c \ diff --git a/Makefile.am b/Makefile.am index a731be5..0a6596d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,10 +10,15 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \ rpm.magic rpmpopt-$(VERSION) rpmqv.c # XXX TODO: perl -SUBDIRS = intl po @WITH_DB_SUBDIR@ popt rpmio lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . +SUBDIRS = intl po @WITH_DB_SUBDIR@ popt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . -INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/rpmio \ - -I$(top_srcdir)/popt @INCPATH@ +INCLUDES = \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + -I$(top_srcdir)/popt \ + @INCPATH@ LIBS = @@ -23,9 +28,10 @@ myLDFLAGS = # -L$(top_builddir)/build/.libs -L$(top_builddir)/lib/.libs \ # XXX libtool can/should generate dependent libs. # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?) # XXX top_builddir ldpaths are wrong building in tree -myLDADD = $(top_builddir)/build/librpmbuild.la \ +myLDADD = \ + $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ - @libdb3a@ \ + $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/popt/libpopt.la \ @INTLLIBS@ @LIBMISC@ @@ -37,7 +43,7 @@ bin_PROGRAMS = rpm2cpio bin_SCRIPTS = gendiff pkglibdir = @RPMCONFIGDIR@ -pkglib_PROGRAMS = rpmb rpmdb rpmi rpmk rpmq +pkglib_PROGRAMS = rpmb rpmd rpmi rpmk rpmq pkglib_DATA = rpmrc rpmpopt-$(VERSION) macros pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \ config.guess config.sub @@ -58,10 +64,10 @@ rpmb_LDADD = rpmb.o $(myLDADD) rpmb.o: rpmqv.c $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.c -rpmdb_SOURCES = -rpmdb_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS) -rpmdb_LDADD = rpmdb.o $(myLDADD) -rpmdb.o: rpmqv.c +rpmd_SOURCES = +rpmd_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS) +rpmd_LDADD = rpmd.o $(myLDADD) +rpmd.o: rpmqv.c $(COMPILE) -DIAM_RPMDB -o $@ -c rpmqv.c rpmi_SOURCES = @@ -93,6 +99,7 @@ lclint: lclint $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) \ `make -s sources -C build` \ `make -s sources -C lib` \ + `make -s sources -C rpmdb` \ `make -s sources -C rpmio` \ `make -s sources -C popt` @@ -122,7 +129,9 @@ install-data-local: @LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify rm -f $(DESTDIR)$(bindir)/rpmsign @LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign - for bf in db e i u ; do \ + rm -f $(DESTDIR)$(bindir)/rpmdb ; \ + @LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb ; \ + for bf in e i u ; do \ rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \ @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \ done diff --git a/build/Makefile.am b/build/Makefile.am index f4d1896..46597d9 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -2,8 +2,12 @@ AUTOMAKE_OPTIONS = 1.4 foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/rpmio \ - -I$(top_srcdir)/popt @INCPATH@ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmio \ + -I$(top_srcdir)/popt \ + @INCPATH@ LIBS = @@ -31,8 +35,3 @@ sources: .PHONY: lclint lclint: lclint ${DEFS} ${INCLUDES} ${librpmbuild_la_SOURCES} - -.PHONY: genhtml -genhtml: - doc++ -d html -f -H -S build.c expression.c -# doc++ -A -d html -f -H -S ${pkginc_HEADERS} ${librpmbuild_la_SOURCES} diff --git a/configure.in b/configure.in index 038df62..46f8f67 100644 --- a/configure.in +++ b/configure.in @@ -25,6 +25,7 @@ AC_PROG_CC if test "$ac_cv_prog_gcc" = yes; then CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts" fi +export CFLAGS AC_PROG_CPP AC_PROG_GCC_TRADITIONAL @@ -1117,26 +1118,14 @@ dnl export LIBS INCPATH CONFIG_SITE AC_CONFIG_SUBDIRS(popt $WITH_DB_SUBDIR) AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec - rpmio/Makefile lib/Makefile build/Makefile tools/Makefile - scripts/Makefile scripts/brp-redhat + rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile + scripts/Makefile scripts/brp-redhat tools/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile misc/Makefile po/Makefile.in intl/Makefile doc/Makefile doc/manual/Makefile doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile perl/Makefile perl/Makefile.PL ], - [ -dnl rm -f db/build_unix/configure -dnl echo "set -x ; exec ../dist/configure \$(echo \$* | sed -e 's% --srcdir=\[^ \]*% --srcdir=../dist%')" > db/build_unix/configure -dnl chmod +x db/build_unix/configure -dnl if test -n "$WITH_DB_SUBDIR"; then -dnl ( cd $WITH_DB_SUBDIR -dnl CFLAGS="$CFLAGS" ../dist/configure --prefix="$prefix" --enable-shared --enable-static - dnl ) -dnl fi - echo timestamp > popt/stamp-h.in + [ echo timestamp > popt/stamp-h.in echo timestamp > stamp-h.in ] ) -dnl touch Makefile.in -dnl sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) - diff --git a/db3/.cvsignore b/db3/.cvsignore new file mode 100644 index 0000000..5e8a5f0 --- /dev/null +++ b/db3/.cvsignore @@ -0,0 +1,24 @@ +.deps +.depend +Makefile +Makefile.in +.libs +*.la +*.lo +config.log +db_config.h +libtool +config.status +include.tcl +db.h +db_int.h +db_archive +db_checkpoint +db_deadlock +db_dump +db_load +db_printlog +db_recover +db_stat +db_upgrade +db_verify diff --git a/db3/configure b/db3/configure index ebfcacf..6ca89f5 100755 --- a/db3/configure +++ b/db3/configure @@ -1,8 +1,8 @@ #!/bin/sh #set -x db_dist="../db/dist" -$db_dist/configure \ - $(echo $* | sed -e "s% --srcdir=[^ ]*% --srcdir=$db_dist%") +CFLAGS="$CFLAGS" $db_dist/configure \ + $(echo $* | sed -e "s% --srcdir=[^ ]*% --enable-shared --enable-static --srcdir=$db_dist%") mv Makefile Makefile.orig cat Makefile.orig | sed -e '/^install:/c\ diff --git a/lib/Makefile.am b/lib/Makefile.am index 65ec46d..a1b4974 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,46 +2,47 @@ AUTOMAKE_OPTIONS = 1.4 foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/rpmio \ - -I$(top_srcdir)/popt @INCPATH@ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + -I$(top_srcdir)/popt \ + @INCPATH@ -EXTRA_DIST = db3.c db2.c db1.c falloc.c getdate.y +EXTRA_DIST = getdate.y pkgincdir = $(pkgincludedir) pkginc_HEADERS = \ header.h misc.h rpmlib.h stringbuf.h noinst_HEADERS = \ - cpio.h depends.h falloc.h fprint.h fsm.h hash.h \ + cpio.h depends.h fprint.h fsm.h hash.h \ manifest.h md5.h psm.h \ - rpmdb.h rpmlead.h signature.h + rpmlead.h signature.h -mylibpaths = -L$(top_builddir)/lib/.libs -L$(top_builddir)/rpmio/.libs \ - -L$(top_builddir)/popt/.libs -mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@ +mylibpaths = \ + -L$(top_builddir)/lib/.libs \ + -L$(top_builddir)/rpmdb/.libs \ + -L$(top_builddir)/rpmio/.libs \ + -L$(top_builddir)/popt/.libs + +mylibs = -lrpm -lrpmdb -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@ LIBS = lib_LTLIBRARIES = librpm.la librpm_la_SOURCES = \ - cpio.c $(DBLIBSRCS) dbconfig.c depends.c \ - formats.c fprint.c fs.c fsm.c getdate.c hash.c header.c \ - manifest.c md5.c md5sum.c misc.c package.c problems.c \ - poptBT.c poptQV.c psm.c query.c \ - rpmchecksig.c rpmdb.c rpminstall.c \ - rpmlead.c rpmlibprov.c rpmrc.c signature.c stringbuf.c \ - tagName.c tagtable.c transaction.c verify.c -librpm_la_LDFLAGS = @libdb3@ @libdb2@ @libdb1@ -librpm_la_LIBADD = $(DBLIBOBJS) -librpm_la_DEPENDENCIES = $(DBLIBOBJS) + cpio.c depends.c formats.c fprint.c fs.c fsm.c getdate.c \ + hash.c header.c manifest.c md5.c md5sum.c misc.c package.c \ + problems.c poptBT.c poptQV.c psm.c query.c rpmchecksig.c \ + rpminstall.c rpmlead.c rpmlibprov.c rpmrc.c signature.c \ + stringbuf.c tagName.c tagtable.c transaction.c verify.c # XXX Add internal libtool dependence install-data-local: @cd $(DESTDIR)/$(libdir) && \ - sed -e "s|^dependency_libs='|& -lrpmio|" < librpm.la > .librpm.la && \ + sed -e "s|^dependency_libs='|& -lrpmdb -lrpmio|" < librpm.la > .librpm.la && \ mv .librpm.la librpm.la -falloc.lo: falloc.c $(top_srcdir)/system.h $(top_srcdir)/rpmio/rpmio.h falloc.h - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - tagtable.c: rpmlib.h @echo '#include "system.h"' > tagtable.c @echo '#include "rpmlib.h"' >> tagtable.c diff --git a/lib/problems.c b/lib/problems.c index 82dffb1..6a5ce58 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -105,7 +105,7 @@ static inline int snprintf(char * buf, int nb, const char * fmt, ...) } #endif -const char * rpmProblemString(rpmProblem prob) /*@*/ +const char * rpmProblemString(rpmProblem prob) { /*@observer@*/ const char * pkgNEVR = (prob->pkgNEVR ? prob->pkgNEVR : ""); /*@observer@*/ const char * altNEVR = (prob->altNEVR ? prob->altNEVR : ""); diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 717e987..e32f58e 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -442,7 +442,7 @@ typedef enum rpmsenseFlags_e { * @deprecated Use rpmExpand() with appropriate macro expression. * @todo Eliminate from API. */ -/*@observer@*/ /*@null@*/ const char * rpmGetVar(int var) /*@*/; +/*@observer@*/ /*@null@*/ extern const char * rpmGetVar(int var) /*@*/; /** \ingroup rpmrc * Set value of an rpmrc variable. @@ -842,7 +842,8 @@ struct rpmDependencyConflict { /** */ void printDepProblems(FILE *fp, struct rpmDependencyConflict *conflicts, - int numConflicts) /*@modifies *fp @*/; + int numConflicts) + /*@modifies *fp @*/; /** * Return formatted string representation of problem. @@ -850,7 +851,8 @@ void printDepProblems(FILE *fp, struct rpmDependencyConflict *conflicts, * @param prob rpm problem * @return formatted string */ -/*@only@*/ const char * rpmProblemString(rpmProblem prob) /*@modifies prob @*/; +/*@only@*/ extern const char * rpmProblemString(rpmProblem prob) + /*@modifies prob @*/; /** * Output formatted string representation of problem to file handle. @@ -1236,7 +1238,8 @@ int rpmRunTransactions(rpmTransactionSet ts, * @param tag tag value * @return name of tag */ -/*@observer@*/ const char *const tagName(int tag) /*@*/; +/*@observer@*/ extern const char *const tagName(int tag) + /*@*/; /** * Return value of tag from name. diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 24698ba..158d08c 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -1209,7 +1209,7 @@ const char * rpmGetVarArch(int var, /*@null@*/ const char * arch) return next ? next->value : NULL; } -/*@observer@*/ /*@null@*/ const char *rpmGetVar(int var) +const char *rpmGetVar(int var) { return rpmGetVarArch(var, NULL); } diff --git a/po/POTFILES.in b/po/POTFILES.in index 94d05a8..1d51241 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -25,12 +25,7 @@ build/parseSpec.c build/reqprov.c build/spec.c lib/cpio.c -lib/db1.c -lib/db2.c -lib/db3.c -lib/dbconfig.c lib/depends.c -lib/falloc.c lib/formats.c lib/fprint.c lib/fs.c @@ -48,7 +43,6 @@ lib/problems.c lib/psm.c lib/query.c lib/rpmchecksig.c -lib/rpmdb.c lib/rpminstall.c lib/rpmlead.c lib/rpmrc.c @@ -56,6 +50,12 @@ lib/signature.c lib/stringbuf.c lib/transaction.c lib/verify.c +rpmdb/db1.c +rpmdb/db2.c +rpmdb/db3.c +rpmdb/dbconfig.c +rpmdb/falloc.c +rpmdb/rpmdb.c rpmio/base64.c rpmio/digest.c rpmio/macro.c diff --git a/po/rpm.pot b/po/rpm.pot index 294da74..a3116cf 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-04-30 18:16-0400\n" +"POT-Creation-Date: 2001-05-07 15:57-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,77 +14,77 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:31 +#: build.c:35 #, c-format msgid "cannot open rpm database in %s\n" msgstr "" -#: build.c:41 +#: build.c:45 msgid "failed build dependencies:\n" msgstr "" -#: build.c:72 +#: build.c:76 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:141 build.c:153 +#: build.c:147 build.c:159 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:160 +#: build.c:166 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:188 +#: build.c:194 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:227 +#: build.c:233 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:232 +#: build.c:238 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:241 +#: build.c:247 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:298 +#: build.c:303 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:313 +#: build.c:318 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm.c:224 rpmqv.c:392 +#: rpm.c:224 rpmqv.c:394 #, c-format msgid "rpm: %s\n" msgstr "" -#: rpm.c:235 rpmqv.c:397 +#: rpm.c:235 rpmqv.c:399 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpm.c:239 rpmqv.c:401 +#: rpm.c:239 rpmqv.c:403 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpm.c:240 rpmqv.c:402 +#: rpm.c:240 rpmqv.c:404 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" @@ -271,15 +271,15 @@ msgstr "" msgid " rpm {--querytags}" msgstr "" -#: rpm.c:327 rpmqv.c:477 +#: rpm.c:327 rpmqv.c:479 msgid "Usage:" msgstr "" -#: rpm.c:329 rpmqv.c:479 +#: rpm.c:329 rpmqv.c:481 msgid "print this message" msgstr "" -#: rpm.c:331 rpmqv.c:128 rpmqv.c:481 +#: rpm.c:331 rpmqv.c:130 rpmqv.c:483 msgid "print the version of rpm being used" msgstr "" @@ -291,7 +291,7 @@ msgstr "" msgid " --define ' '" msgstr "" -#: rpm.c:336 rpmqv.c:135 rpmqv.c:486 +#: rpm.c:336 rpmqv.c:137 rpmqv.c:488 msgid "define macro with value " msgstr "" @@ -307,7 +307,7 @@ msgstr "" msgid " --pipe " msgstr "" -#: rpm.c:340 rpmqv.c:141 rpmqv.c:490 +#: rpm.c:340 rpmqv.c:143 rpmqv.c:492 msgid "send stdout to " msgstr "" @@ -319,15 +319,15 @@ msgstr "" msgid "use instead of /etc/rpmrc and $HOME/.rpmrc" msgstr "" -#: rpm.c:344 rpmqv.c:159 rpmqv.c:494 +#: rpm.c:344 rpmqv.c:161 rpmqv.c:496 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpm.c:346 rpmqv.c:502 +#: rpm.c:346 rpmqv.c:504 msgid "be a little more verbose" msgstr "" -#: rpm.c:348 rpmqv.c:504 +#: rpm.c:348 rpmqv.c:506 msgid "be incredibly verbose (for debugging)" msgstr "" @@ -343,7 +343,7 @@ msgstr "" msgid " --ftpproxy " msgstr "" -#: rpm.c:354 rpmqv.c:511 +#: rpm.c:354 rpmqv.c:513 msgid "hostname or IP of ftp proxy" msgstr "" @@ -351,7 +351,7 @@ msgstr "" msgid " --ftpport " msgstr "" -#: rpm.c:356 rpmqv.c:513 +#: rpm.c:356 rpmqv.c:515 msgid "port number of ftp server (or proxy)" msgstr "" @@ -359,7 +359,7 @@ msgstr "" msgid " --httpproxy " msgstr "" -#: rpm.c:358 rpmqv.c:515 +#: rpm.c:358 rpmqv.c:517 msgid "hostname or IP of http proxy" msgstr "" @@ -367,11 +367,11 @@ msgstr "" msgid " --httpport " msgstr "" -#: rpm.c:360 rpmqv.c:517 +#: rpm.c:360 rpmqv.c:519 msgid "port number of http server (or proxy)" msgstr "" -#: rpm.c:364 rpmqv.c:537 +#: rpm.c:364 rpmqv.c:539 msgid "query mode" msgstr "" @@ -379,7 +379,7 @@ msgstr "" msgid " --dbpath " msgstr "" -#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:497 +#: rpm.c:366 rpm.c:412 rpm.c:437 rpm.c:489 rpm.c:561 rpmqv.c:499 msgid "use as the directory for the database" msgstr "" @@ -387,7 +387,7 @@ msgstr "" msgid " --queryformat " msgstr "" -#: rpm.c:368 rpmqv.c:539 +#: rpm.c:368 rpmqv.c:541 msgid "use as the header format (implies --info)" msgstr "" @@ -395,7 +395,7 @@ msgstr "" msgid " --root " msgstr "" -#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:144 rpmqv.c:499 +#: rpm.c:370 rpm.c:414 rpm.c:472 rpm.c:501 rpm.c:563 rpmqv.c:146 rpmqv.c:501 msgid "use as the top level directory" msgstr "" @@ -451,31 +451,31 @@ msgstr "" msgid " Information selection options:" msgstr "" -#: rpm.c:386 rpmqv.c:543 +#: rpm.c:386 rpmqv.c:545 msgid "display package information" msgstr "" -#: rpm.c:388 rpmqv.c:545 +#: rpm.c:388 rpmqv.c:547 msgid "display the package's change log" msgstr "" -#: rpm.c:390 rpmqv.c:547 +#: rpm.c:390 rpmqv.c:549 msgid "display package file list" msgstr "" -#: rpm.c:392 rpmqv.c:549 +#: rpm.c:392 rpmqv.c:551 msgid "show file states (implies -l)" msgstr "" -#: rpm.c:394 rpmqv.c:551 +#: rpm.c:394 rpmqv.c:553 msgid "list only documentation files (implies -l)" msgstr "" -#: rpm.c:396 rpmqv.c:553 +#: rpm.c:396 rpmqv.c:555 msgid "list only configuration files (implies -l)" msgstr "" -#: rpm.c:398 rpmqv.c:555 +#: rpm.c:398 rpmqv.c:557 msgid "" "show all verifiable information for each file (must be used with -l, -c, or " "-d)" @@ -497,26 +497,26 @@ msgstr "" msgid "show the trigger scripts contained in the package" msgstr "" -#: rpm.c:410 rpmqv.c:566 +#: rpm.c:410 rpmqv.c:568 msgid "" "verify a package installation using the same same package specification " "options as -q" msgstr "" -#: lib/poptBT.c:187 lib/verify.c:60 rpm.c:416 rpm.c:458 rpm.c:493 rpmqv.c:268 -#: rpmqv.c:568 rpmqv.c:616 rpmqv.c:650 +#: lib/poptBT.c:187 lib/verify.c:60 rpm.c:416 rpm.c:458 rpm.c:493 rpmqv.c:270 +#: rpmqv.c:570 rpmqv.c:618 rpmqv.c:652 msgid "do not verify package dependencies" msgstr "" -#: lib/verify.c:66 rpm.c:418 rpmqv.c:208 rpmqv.c:572 +#: lib/verify.c:66 rpm.c:418 rpmqv.c:210 rpmqv.c:574 msgid "do not verify file md5 checksums" msgstr "" -#: rpm.c:420 rpmqv.c:570 +#: rpm.c:420 rpmqv.c:572 msgid "do not verify file attributes" msgstr "" -#: rpm.c:422 rpmqv.c:577 +#: rpm.c:422 rpmqv.c:579 msgid "list the tags that can be used in a query format" msgstr "" @@ -528,7 +528,7 @@ msgstr "" msgid " -i " msgstr "" -#: rpm.c:427 rpmqv.c:264 rpmqv.c:591 +#: rpm.c:427 rpmqv.c:266 rpmqv.c:593 msgid "install package" msgstr "" @@ -544,11 +544,11 @@ msgstr "" msgid " --relocate =" msgstr "" -#: rpm.c:431 rpmqv.c:628 +#: rpm.c:431 rpmqv.c:630 msgid "relocate files from to " msgstr "" -#: rpm.c:433 rpmqv.c:236 rpmqv.c:596 +#: rpm.c:433 rpmqv.c:238 rpmqv.c:598 msgid "relocate files in non-relocateable package" msgstr "" @@ -556,47 +556,47 @@ msgstr "" msgid " --prefix " msgstr "" -#: rpm.c:435 rpmqv.c:311 rpmqv.c:626 +#: rpm.c:435 rpmqv.c:313 rpmqv.c:628 msgid "relocate the package to , if relocatable" msgstr "" -#: rpm.c:439 rpmqv.c:242 rpmqv.c:598 +#: rpm.c:439 rpmqv.c:244 rpmqv.c:600 msgid "do not install documentation" msgstr "" -#: rpm.c:441 rpmqv.c:247 rpmqv.c:602 +#: rpm.c:441 rpmqv.c:249 rpmqv.c:604 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: rpm.c:443 rpmqv.c:253 rpmqv.c:604 +#: rpm.c:443 rpmqv.c:255 rpmqv.c:606 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: rpm.c:445 rpmqv.c:224 rpmqv.c:593 +#: rpm.c:445 rpmqv.c:226 rpmqv.c:595 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: rpm.c:448 rpmqv.c:255 rpmqv.c:606 +#: rpm.c:448 rpmqv.c:257 rpmqv.c:608 msgid "don't verify package architecture" msgstr "" -#: rpm.c:450 rpmqv.c:260 rpmqv.c:608 +#: rpm.c:450 rpmqv.c:262 rpmqv.c:610 msgid "don't check disk space before installing" msgstr "" -#: rpm.c:452 rpmqv.c:257 rpmqv.c:610 +#: rpm.c:452 rpmqv.c:259 rpmqv.c:612 msgid "don't verify package operating system" msgstr "" -#: rpm.c:454 rpmqv.c:262 rpmqv.c:612 +#: rpm.c:454 rpmqv.c:264 rpmqv.c:614 msgid "install documentation" msgstr "" -#: rpm.c:456 rpm.c:491 rpmqv.c:266 rpmqv.c:614 rpmqv.c:648 +#: rpm.c:456 rpm.c:491 rpmqv.c:268 rpmqv.c:616 rpmqv.c:650 msgid "update the database, but do not modify the filesystem" msgstr "" -#: rpm.c:460 rpm.c:495 rpmqv.c:270 rpmqv.c:618 rpmqv.c:652 +#: rpm.c:460 rpm.c:495 rpmqv.c:272 rpmqv.c:620 rpmqv.c:654 msgid "do not reorder package installation to satisfy dependencies" msgstr "" @@ -604,23 +604,23 @@ msgstr "" msgid "don't execute any installation scripts" msgstr "" -#: rpm.c:464 rpm.c:499 rpmqv.c:656 +#: rpm.c:464 rpm.c:499 rpmqv.c:658 msgid "don't execute any scripts triggered by this package" msgstr "" -#: rpm.c:466 rpmqv.c:309 rpmqv.c:624 +#: rpm.c:466 rpmqv.c:311 rpmqv.c:626 msgid "print percentages as package installs" msgstr "" -#: rpm.c:468 rpmqv.c:320 rpmqv.c:630 +#: rpm.c:468 rpmqv.c:322 rpmqv.c:632 msgid "install even if the package replaces installed files" msgstr "" -#: rpm.c:470 rpmqv.c:322 rpmqv.c:632 +#: rpm.c:470 rpmqv.c:324 rpmqv.c:634 msgid "reinstall if the package is already present" msgstr "" -#: rpm.c:474 rpmqv.c:324 rpmqv.c:634 +#: rpm.c:474 rpmqv.c:326 rpmqv.c:636 msgid "don't install, but tell if it would work or not" msgstr "" @@ -632,11 +632,11 @@ msgstr "" msgid " -U " msgstr "" -#: rpm.c:479 rpmqv.c:638 +#: rpm.c:479 rpmqv.c:640 msgid "upgrade package (same options as --install, plus)" msgstr "" -#: rpm.c:481 rpmqv.c:306 rpmqv.c:640 +#: rpm.c:481 rpmqv.c:308 rpmqv.c:642 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" @@ -650,17 +650,17 @@ msgstr "" msgid " -e " msgstr "" -#: rpm.c:485 rpmqv.c:240 rpmqv.c:644 +#: rpm.c:485 rpmqv.c:242 rpmqv.c:646 msgid "erase (uninstall) package" msgstr "" -#: rpm.c:487 rpmqv.c:227 rpmqv.c:646 +#: rpm.c:487 rpmqv.c:229 rpmqv.c:648 msgid "" "remove all packages which match (normally an error is generated if " " specified multiple packages)" msgstr "" -#: rpm.c:497 rpmqv.c:654 +#: rpm.c:497 rpmqv.c:656 msgid "do not execute any package specific scripts" msgstr "" @@ -717,7 +717,7 @@ msgstr "" msgid "remove spec file when done" msgstr "" -#: lib/poptBT.c:200 rpm.c:527 rpmqv.c:200 +#: lib/poptBT.c:200 rpm.c:527 rpmqv.c:202 msgid "generate PGP/GPG signature" msgstr "" @@ -763,7 +763,7 @@ msgstr "" msgid " --resign + " msgstr "" -#: rpm.c:542 rpmqv.c:198 rpmqv.c:662 +#: rpm.c:542 rpmqv.c:200 rpmqv.c:664 msgid "sign a package (discard current signature)" msgstr "" @@ -771,7 +771,7 @@ msgstr "" msgid " --addsign + " msgstr "" -#: rpm.c:544 rpmqv.c:196 rpmqv.c:664 +#: rpm.c:544 rpmqv.c:198 rpmqv.c:666 msgid "add a signature to a package" msgstr "" @@ -783,19 +783,19 @@ msgstr "" msgid " -K + " msgstr "" -#: rpm.c:547 rpmqv.c:202 rpmqv.c:668 +#: rpm.c:547 rpmqv.c:204 rpmqv.c:670 msgid "verify package signature" msgstr "" -#: rpm.c:549 rpmqv.c:204 rpmqv.c:670 +#: rpm.c:549 rpmqv.c:206 rpmqv.c:672 msgid "skip any PGP signatures" msgstr "" -#: rpm.c:551 rpmqv.c:206 rpmqv.c:672 +#: rpm.c:551 rpmqv.c:208 rpmqv.c:674 msgid "skip any GPG signatures" msgstr "" -#: rpm.c:553 rpmqv.c:674 +#: rpm.c:553 rpmqv.c:676 msgid "skip any MD5 signatures" msgstr "" @@ -807,21 +807,21 @@ msgstr "" msgid "rebuild database from existing database" msgstr "" -#: rpm.c:567 rpmqv.c:579 +#: rpm.c:567 rpmqv.c:581 msgid "" "set the file permissions to those in the package database using the same " "package specification options as -q" msgstr "" -#: rpm.c:570 rpmqv.c:582 +#: rpm.c:570 rpmqv.c:584 msgid "" "set the file owner and group to those in the package database using the same " "package specification options as -q" msgstr "" #: rpm.c:722 rpm.c:728 rpm.c:737 rpm.c:759 rpm.c:765 rpm.c:772 rpm.c:780 -#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:867 rpmqv.c:873 rpmqv.c:880 -#: rpmqv.c:886 rpmqv.c:920 rpmqv.c:928 rpmqv.c:934 rpmqv.c:942 rpmqv.c:1009 +#: rpm.c:788 rpm.c:809 rpm.c:872 rpmqv.c:877 rpmqv.c:883 rpmqv.c:890 +#: rpmqv.c:896 rpmqv.c:938 rpmqv.c:946 rpmqv.c:952 rpmqv.c:960 rpmqv.c:1033 msgid "only one major mode may be specified" msgstr "" @@ -833,23 +833,23 @@ msgstr "" msgid "Use -e or --erase instead.\n" msgstr "" -#: rpm.c:815 rpmqv.c:904 +#: rpm.c:815 rpmqv.c:919 msgid "relocations must begin with a /" msgstr "" -#: rpm.c:817 rpmqv.c:906 +#: rpm.c:817 rpmqv.c:921 msgid "relocations must contain a =" msgstr "" -#: rpm.c:820 rpmqv.c:909 +#: rpm.c:820 rpmqv.c:925 msgid "relocations must have a / following the =" msgstr "" -#: rpm.c:829 rpmqv.c:893 +#: rpm.c:829 rpmqv.c:904 msgid "exclude paths must begin with a /" msgstr "" -#: rpm.c:838 rpmqv.c:963 +#: rpm.c:838 rpmqv.c:986 msgid "The --rcfile option has been eliminated.\n" msgstr "" @@ -857,101 +857,101 @@ msgstr "" msgid "Use --macros with a colon separated list of macro files to read.\n" msgstr "" -#: rpm.c:844 rpmqv.c:969 +#: rpm.c:844 rpmqv.c:993 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpm.c:879 rpmqv.c:1024 +#: rpm.c:879 rpmqv.c:1048 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpm.c:884 rpmqv.c:1028 +#: rpm.c:884 rpmqv.c:1052 msgid "unexpected query flags" msgstr "" -#: rpm.c:887 rpmqv.c:1031 +#: rpm.c:887 rpmqv.c:1055 msgid "unexpected query format" msgstr "" -#: rpm.c:890 rpmqv.c:1034 +#: rpm.c:890 rpmqv.c:1058 msgid "unexpected query source" msgstr "" -#: rpm.c:893 rpmqv.c:1044 +#: rpm.c:893 rpmqv.c:1068 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpm.c:896 rpmqv.c:1049 +#: rpm.c:896 rpmqv.c:1073 msgid "files may only be relocated during package installation" msgstr "" -#: rpm.c:899 rpmqv.c:1052 +#: rpm.c:899 rpmqv.c:1076 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpm.c:902 rpmqv.c:1055 +#: rpm.c:902 rpmqv.c:1079 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpm.c:905 rpmqv.c:1058 +#: rpm.c:905 rpmqv.c:1082 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpm.c:908 rpmqv.c:1061 +#: rpm.c:908 rpmqv.c:1085 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpm.c:911 rpmqv.c:1064 +#: rpm.c:911 rpmqv.c:1088 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpm.c:915 rpmqv.c:1068 +#: rpm.c:915 rpmqv.c:1092 msgid "--percent may only be specified during package installation" msgstr "" -#: rpm.c:919 rpmqv.c:1073 +#: rpm.c:919 rpmqv.c:1097 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpm.c:923 rpmqv.c:1077 +#: rpm.c:923 rpmqv.c:1101 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpm.c:927 rpmqv.c:1081 +#: rpm.c:927 rpmqv.c:1105 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpm.c:931 rpmqv.c:1085 +#: rpm.c:931 rpmqv.c:1109 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpm.c:935 rpmqv.c:1089 +#: rpm.c:935 rpmqv.c:1113 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpm.c:939 rpmqv.c:1093 +#: rpm.c:939 rpmqv.c:1117 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpm.c:943 rpmqv.c:1097 +#: rpm.c:943 rpmqv.c:1121 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpm.c:947 rpmqv.c:1102 +#: rpm.c:947 rpmqv.c:1126 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpm.c:951 rpmqv.c:1106 +#: rpm.c:951 rpmqv.c:1130 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpm.c:955 rpmqv.c:1110 +#: rpm.c:955 rpmqv.c:1134 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpm.c:959 rpmqv.c:1115 +#: rpm.c:959 rpmqv.c:1139 msgid "--justdb may only be specified during package installation and erasure" msgstr "" @@ -965,31 +965,31 @@ msgstr "" msgid "--apply may only be specified during package installation" msgstr "" -#: rpm.c:975 rpmqv.c:1127 +#: rpm.c:975 rpmqv.c:1151 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpm.c:979 rpmqv.c:1131 +#: rpm.c:979 rpmqv.c:1155 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpm.c:984 rpmqv.c:1136 +#: rpm.c:984 rpmqv.c:1160 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpm.c:988 rpmqv.c:1141 +#: rpm.c:988 rpmqv.c:1165 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpm.c:1000 rpmqv.c:1153 +#: rpm.c:1000 rpmqv.c:1177 msgid "arguments to --root (-r) must begin with a /" msgstr "" @@ -997,89 +997,89 @@ msgstr "" msgid "--oldpackage may only be used during upgrades" msgstr "" -#: rpm.c:1009 rpmqv.c:1160 +#: rpm.c:1009 rpmqv.c:1184 msgid "--nopgp may only be used during signature checking" msgstr "" -#: rpm.c:1012 rpmqv.c:1163 +#: rpm.c:1012 rpmqv.c:1187 msgid "--nogpg may only be used during signature checking" msgstr "" -#: rpm.c:1015 rpmqv.c:1168 +#: rpm.c:1015 rpmqv.c:1192 msgid "" "--nomd5 may only be used during signature checking and package verification" msgstr "" -#: rpm.c:1026 rpmqv.c:1184 +#: rpm.c:1026 rpmqv.c:1208 msgid "no files to sign\n" msgstr "" -#: rpm.c:1031 rpmqv.c:1189 +#: rpm.c:1031 rpmqv.c:1213 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpm.c:1046 rpmqv.c:1208 +#: rpm.c:1046 rpmqv.c:1232 msgid "pgp not found: " msgstr "" -#: rpm.c:1050 rpmqv.c:1213 +#: rpm.c:1050 rpmqv.c:1237 msgid "Enter pass phrase: " msgstr "" -#: rpm.c:1052 rpmqv.c:1215 +#: rpm.c:1052 rpmqv.c:1239 msgid "Pass phrase check failed\n" msgstr "" -#: rpm.c:1055 rpmqv.c:1219 +#: rpm.c:1055 rpmqv.c:1243 msgid "Pass phrase is good.\n" msgstr "" -#: rpm.c:1060 rpmqv.c:1224 +#: rpm.c:1060 rpmqv.c:1248 msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpm.c:1066 rpmqv.c:1231 +#: rpm.c:1066 rpmqv.c:1255 msgid "--sign may only be used during package building" msgstr "" -#: rpm.c:1081 rpmqv.c:1247 +#: rpm.c:1081 rpmqv.c:1271 msgid "exec failed\n" msgstr "" -#: rpm.c:1100 rpmqv.c:1497 +#: rpm.c:1100 rpmqv.c:1521 msgid "unexpected arguments to --querytags " msgstr "" -#: rpm.c:1111 rpmqv.c:1521 +#: rpm.c:1111 rpmqv.c:1545 msgid "no packages given for signature check" msgstr "" -#: rpm.c:1122 rpmqv.c:1532 +#: rpm.c:1122 rpmqv.c:1556 msgid "no packages given for signing" msgstr "" -#: rpm.c:1138 rpmqv.c:1391 +#: rpm.c:1138 rpmqv.c:1415 msgid "no packages given for uninstall" msgstr "" -#: rpm.c:1227 rpmqv.c:1420 +#: rpm.c:1227 rpmqv.c:1444 msgid "no packages given for install" msgstr "" -#: rpm.c:1251 rpmqv.c:1463 +#: rpm.c:1251 rpmqv.c:1487 msgid "extra arguments given for query of all packages" msgstr "" -#: rpm.c:1256 rpmqv.c:1468 +#: rpm.c:1256 rpmqv.c:1492 msgid "no arguments given for query" msgstr "" -#: rpm.c:1273 rpmqv.c:1485 +#: rpm.c:1273 rpmqv.c:1509 msgid "extra arguments given for verify of all packages" msgstr "" -#: rpm.c:1277 rpmqv.c:1489 +#: rpm.c:1277 rpmqv.c:1513 msgid "no arguments given for verify" msgstr "" @@ -1101,442 +1101,442 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:131 +#: rpmqv.c:133 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:133 +#: rpmqv.c:135 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:136 +#: rpmqv.c:138 msgid "' '" msgstr "" -#: rpmqv.c:138 +#: rpmqv.c:140 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:139 +#: rpmqv.c:141 msgid "+" msgstr "" -#: rpmqv.c:142 +#: rpmqv.c:144 msgid "" msgstr "" -#: rpmqv.c:145 rpmqv.c:312 +#: rpmqv.c:147 rpmqv.c:314 msgid "" msgstr "" -#: rpmqv.c:147 +#: rpmqv.c:149 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:148 rpmqv.c:152 rpmqv.c:156 +#: rpmqv.c:150 rpmqv.c:154 rpmqv.c:158 msgid "" msgstr "" -#: rpmqv.c:151 rpmqv.c:155 +#: rpmqv.c:153 rpmqv.c:157 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:164 +#: rpmqv.c:166 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:167 +#: rpmqv.c:169 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:169 +#: rpmqv.c:171 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:171 +#: rpmqv.c:173 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:179 +#: rpmqv.c:181 msgid "initialize database" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:183 msgid "rebuild database inverted lists from installed package headers" msgstr "" -#: rpmqv.c:184 +#: rpmqv.c:186 msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" -#: lib/poptBT.c:179 rpmqv.c:187 +#: lib/poptBT.c:179 rpmqv.c:189 msgid "generate headers compatible with rpm4 packaging" msgstr "" -#: rpmqv.c:233 rpmqv.c:275 +#: rpmqv.c:235 rpmqv.c:277 msgid "do not execute package scriptlet(s)" msgstr "" -#: rpmqv.c:238 +#: rpmqv.c:240 msgid "save erased package files by renaming into sub-directory" msgstr "" -#: rpmqv.c:240 +#: rpmqv.c:242 msgid "+" msgstr "" -#: rpmqv.c:244 rpmqv.c:600 +#: rpmqv.c:246 rpmqv.c:602 msgid "skip files with leading component " msgstr "" -#: rpmqv.c:245 +#: rpmqv.c:247 msgid "" msgstr "" -#: rpmqv.c:250 +#: rpmqv.c:252 msgid "upgrade package(s) if already installed" msgstr "" -#: rpmqv.c:251 rpmqv.c:264 rpmqv.c:327 +#: rpmqv.c:253 rpmqv.c:266 rpmqv.c:329 msgid "+" msgstr "" -#: rpmqv.c:278 +#: rpmqv.c:280 msgid "do not execute %%pre scriptlet (if any)" msgstr "" -#: rpmqv.c:281 +#: rpmqv.c:283 msgid "do not execute %%post scriptlet (if any)" msgstr "" -#: rpmqv.c:284 +#: rpmqv.c:286 msgid "do not execute %%preun scriptlet (if any)" msgstr "" -#: rpmqv.c:287 +#: rpmqv.c:289 msgid "do not execute %%postun scriptlet (if any)" msgstr "" -#: rpmqv.c:291 +#: rpmqv.c:293 msgid "do not execute any scriptlet(s) triggered by this package" msgstr "" -#: rpmqv.c:294 +#: rpmqv.c:296 msgid "do not execute any %%triggerprein scriptlet(s)" msgstr "" -#: rpmqv.c:297 +#: rpmqv.c:299 msgid "do not execute any %%triggerin scriptlet(s)" msgstr "" -#: rpmqv.c:300 +#: rpmqv.c:302 msgid "do not execute any %%triggerun scriptlet(s)" msgstr "" -#: rpmqv.c:303 +#: rpmqv.c:305 msgid "do not execute any %%triggerpostun scriptlet(s)" msgstr "" -#: rpmqv.c:314 +#: rpmqv.c:316 msgid "relocate files from path to " msgstr "" -#: rpmqv.c:315 +#: rpmqv.c:317 msgid "=" msgstr "" -#: rpmqv.c:317 +#: rpmqv.c:319 msgid "save erased package files by repackaging" msgstr "" -#: rpmqv.c:326 +#: rpmqv.c:328 msgid "upgrade package(s)" msgstr "" -#: rpmqv.c:346 +#: rpmqv.c:348 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:349 +#: rpmqv.c:351 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:355 +#: rpmqv.c:357 msgid "Signature options:" msgstr "" -#: rpmqv.c:361 +#: rpmqv.c:363 msgid "Database options:" msgstr "" -#: rpmqv.c:367 +#: rpmqv.c:369 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:373 +#: rpmqv.c:375 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:378 +#: rpmqv.c:380 msgid "Common options for all rpm modes:" msgstr "" -#: rpmqv.c:413 +#: rpmqv.c:415 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:484 +#: rpmqv.c:486 msgid " All modes support the following options:" msgstr "" -#: rpmqv.c:485 +#: rpmqv.c:487 msgid " --define ' '" msgstr "" -#: rpmqv.c:487 +#: rpmqv.c:489 msgid " --eval '+' " msgstr "" -#: rpmqv.c:488 +#: rpmqv.c:490 msgid "print the expansion of macro to stdout" msgstr "" -#: rpmqv.c:489 +#: rpmqv.c:491 msgid " --pipe " msgstr "" -#: rpmqv.c:491 +#: rpmqv.c:493 msgid " --rcfile " msgstr "" -#: rpmqv.c:492 +#: rpmqv.c:494 msgid "use instead of default list of macro files" msgstr "" -#: rpmqv.c:496 +#: rpmqv.c:498 msgid " --dbpath " msgstr "" -#: rpmqv.c:498 +#: rpmqv.c:500 msgid " --root " msgstr "" -#: rpmqv.c:508 +#: rpmqv.c:510 msgid "" " Install, upgrade and query (with -p) modes allow URL's to be used in place" msgstr "" -#: rpmqv.c:509 +#: rpmqv.c:511 msgid " of file names as well as the following options:" msgstr "" -#: rpmqv.c:510 +#: rpmqv.c:512 msgid " --ftpproxy " msgstr "" -#: rpmqv.c:512 +#: rpmqv.c:514 msgid " --ftpport " msgstr "" -#: rpmqv.c:514 +#: rpmqv.c:516 msgid " --httpproxy " msgstr "" -#: rpmqv.c:516 +#: rpmqv.c:518 msgid " --httpport " msgstr "" -#: rpmqv.c:522 +#: rpmqv.c:524 msgid " Package specification options:" msgstr "" -#: lib/poptQV.c:68 rpmqv.c:524 +#: lib/poptQV.c:68 rpmqv.c:526 msgid "query/verify all packages" msgstr "" -#: rpmqv.c:525 +#: rpmqv.c:527 msgid " -f + " msgstr "" -#: rpmqv.c:526 +#: rpmqv.c:528 msgid "query/verify package owning " msgstr "" -#: rpmqv.c:527 +#: rpmqv.c:529 msgid " -p + " msgstr "" -#: rpmqv.c:528 +#: rpmqv.c:530 msgid "query/verify (uninstalled) package " msgstr "" -#: rpmqv.c:529 +#: rpmqv.c:531 msgid " --triggeredby " msgstr "" -#: rpmqv.c:530 +#: rpmqv.c:532 msgid "query/verify packages triggered by " msgstr "" -#: rpmqv.c:531 +#: rpmqv.c:533 msgid " --whatprovides " msgstr "" -#: rpmqv.c:532 +#: rpmqv.c:534 msgid "query/verify packages which provide capability" msgstr "" -#: rpmqv.c:533 +#: rpmqv.c:535 msgid " --whatrequires " msgstr "" -#: rpmqv.c:534 +#: rpmqv.c:536 msgid "query/verify packages which require capability" msgstr "" -#: rpmqv.c:538 +#: rpmqv.c:540 msgid " --queryformat " msgstr "" -#: rpmqv.c:541 +#: rpmqv.c:543 msgid " Information selection options:" msgstr "" -#: rpmqv.c:557 +#: rpmqv.c:559 msgid "list capabilities provided by package" msgstr "" -#: rpmqv.c:559 +#: rpmqv.c:561 msgid "list capabilities required by package" msgstr "" -#: rpmqv.c:561 +#: rpmqv.c:563 msgid "print the various [un]install scriptlets" msgstr "" -#: rpmqv.c:563 +#: rpmqv.c:565 msgid "show the trigger scriptlets contained in the package" msgstr "" -#: rpmqv.c:574 +#: rpmqv.c:576 msgid "do not execute scripts (if any)" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:591 msgid " --install " msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:592 msgid " -i " msgstr "" -#: rpmqv.c:599 +#: rpmqv.c:601 msgid " --excludepath " msgstr "" -#: rpmqv.c:620 +#: rpmqv.c:622 msgid "don't execute any installation scriptlets" msgstr "" -#: rpmqv.c:622 +#: rpmqv.c:624 msgid "don't execute any scriptlets triggered by this package" msgstr "" -#: rpmqv.c:625 +#: rpmqv.c:627 msgid " --prefix " msgstr "" -#: rpmqv.c:627 +#: rpmqv.c:629 msgid " --relocate =" msgstr "" -#: rpmqv.c:636 +#: rpmqv.c:638 msgid " --upgrade " msgstr "" -#: rpmqv.c:637 +#: rpmqv.c:639 msgid " -U " msgstr "" -#: rpmqv.c:642 +#: rpmqv.c:644 msgid " --erase " msgstr "" -#: rpmqv.c:643 +#: rpmqv.c:645 msgid " -e " msgstr "" -#: rpmqv.c:661 +#: rpmqv.c:663 msgid " --resign + " msgstr "" -#: rpmqv.c:663 +#: rpmqv.c:665 msgid " --addsign + " msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:668 msgid " --checksig +" msgstr "" -#: rpmqv.c:667 +#: rpmqv.c:669 msgid " -K + " msgstr "" -#: rpmqv.c:680 +#: rpmqv.c:682 msgid "initalize database (unnecessary, legacy use)" msgstr "" -#: rpmqv.c:682 +#: rpmqv.c:684 msgid "rebuild database indices from existing database headers" msgstr "" -#: rpmqv.c:964 +#: rpmqv.c:987 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1062 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:1122 +#: rpmqv.c:1146 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:1289 +#: rpmqv.c:1313 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1358 +#: rpmqv.c:1382 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1360 +#: rpmqv.c:1384 msgid "no tar files given for build" msgstr "" -#: build/build.c:117 build/pack.c:390 +#: build/build.c:119 build/pack.c:411 msgid "Unable to open temp file.\n" msgstr "" -#: build/build.c:196 +#: build/build.c:198 #, c-format msgid "Executing(%s): %s\n" msgstr "" -#: build/build.c:202 +#: build/build.c:204 #, c-format msgid "Exec of %s failed (%s): %s\n" msgstr "" -#: build/build.c:211 +#: build/build.c:213 #, c-format msgid "Bad exit status from %s (%s)\n" msgstr "" -#: build/build.c:310 +#: build/build.c:313 msgid "" "\n" "\n" @@ -1592,308 +1592,308 @@ msgstr "" msgid "syntax error in expression\n" msgstr "" -#: build/files.c:255 +#: build/files.c:261 #, c-format msgid "TIMECHECK failure: %s\n" msgstr "" -#: build/files.c:308 build/files.c:398 build/files.c:576 +#: build/files.c:319 build/files.c:412 build/files.c:595 #, c-format msgid "Missing '(' in %s %s\n" msgstr "" -#: build/files.c:319 build/files.c:521 build/files.c:587 +#: build/files.c:330 build/files.c:537 build/files.c:606 #, c-format msgid "Missing ')' in %s(%s\n" msgstr "" -#: build/files.c:357 build/files.c:546 +#: build/files.c:368 build/files.c:562 #, c-format msgid "Invalid %s token: %s\n" msgstr "" -#: build/files.c:414 +#: build/files.c:428 #, c-format msgid "Non-white space follows %s(): %s\n" msgstr "" -#: build/files.c:452 +#: build/files.c:466 #, c-format msgid "Bad syntax: %s(%s)\n" msgstr "" -#: build/files.c:462 +#: build/files.c:476 #, c-format msgid "Bad mode spec: %s(%s)\n" msgstr "" -#: build/files.c:474 +#: build/files.c:488 #, c-format msgid "Bad dirmode spec: %s(%s)\n" msgstr "" -#: build/files.c:614 +#: build/files.c:633 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n" msgstr "" -#: build/files.c:624 +#: build/files.c:644 msgid "Duplicate locale %.*s in %%lang(%s)\n" msgstr "" -#: build/files.c:763 +#: build/files.c:790 msgid "Hit limit for %%docdir\n" msgstr "" -#: build/files.c:769 +#: build/files.c:796 msgid "Only one arg for %%docdir\n" msgstr "" #. We already got a file -- error -#: build/files.c:797 +#: build/files.c:824 #, c-format msgid "Two files on one line: %s\n" msgstr "" -#: build/files.c:811 +#: build/files.c:838 #, c-format msgid "File must begin with \"/\": %s\n" msgstr "" -#: build/files.c:823 +#: build/files.c:850 msgid "Can't mix special %%doc with other forms: %s\n" msgstr "" -#: build/files.c:990 +#: build/files.c:1021 #, c-format msgid "File listed twice: %s\n" msgstr "" -#: build/files.c:1132 +#: build/files.c:1163 #, c-format msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1316 +#: build/files.c:1354 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1326 +#: build/files.c:1364 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1369 build/files.c:1896 build/parsePrep.c:44 +#: build/files.c:1407 build/files.c:1959 build/parsePrep.c:44 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1381 +#: build/files.c:1419 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1459 +#: build/files.c:1500 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1489 +#: build/files.c:1530 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1545 +#: build/files.c:1588 msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1555 build/pack.c:122 +#: build/files.c:1599 build/pack.c:134 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:1884 +#: build/files.c:1947 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1952 +#: build/files.c:2018 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:1957 +#: build/files.c:2023 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2039 +#: build/files.c:2105 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2043 +#: build/files.c:2109 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2170 +#: build/files.c:2239 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2194 build/files.c:2208 +#: build/files.c:2263 build/files.c:2277 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2396 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" -#: build/names.c:41 +#: build/names.c:42 msgid "getUname: too many uid's\n" msgstr "" -#: build/names.c:62 +#: build/names.c:63 msgid "getUnameS: too many uid's\n" msgstr "" -#: build/names.c:83 +#: build/names.c:84 msgid "getGname: too many gid's\n" msgstr "" -#: build/names.c:104 +#: build/names.c:105 msgid "getGnameS: too many gid's\n" msgstr "" -#: build/names.c:134 +#: build/names.c:136 #, c-format msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:67 +#: build/pack.c:74 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:88 +#: build/pack.c:96 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:95 +#: build/pack.c:103 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:180 +#: build/pack.c:196 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:187 +#: build/pack.c:203 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:194 +#: build/pack.c:210 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:201 +#: build/pack.c:217 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:209 +#: build/pack.c:225 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:224 +#: build/pack.c:240 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:250 +#: build/pack.c:265 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:274 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:281 +#: build/pack.c:296 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:290 +#: build/pack.c:305 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:402 +#: build/pack.c:424 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:444 +#: build/pack.c:466 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:454 +#: build/pack.c:480 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:491 lib/psm.c:1449 +#: build/pack.c:517 lib/psm.c:1460 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:506 +#: build/pack.c:532 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:516 +#: build/pack.c:542 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:530 +#: build/pack.c:556 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:540 +#: build/pack.c:566 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:546 +#: build/pack.c:572 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:573 lib/psm.c:1686 +#: build/pack.c:599 lib/psm.c:1719 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:638 +#: build/pack.c:667 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:655 +#: build/pack.c:684 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1903,27 +1903,27 @@ msgstr "" msgid "line %d: second %s\n" msgstr "" -#: build/parseChangelog.c:121 +#: build/parseChangelog.c:123 msgid "%%changelog entries must start with *\n" msgstr "" -#: build/parseChangelog.c:129 +#: build/parseChangelog.c:131 msgid "incomplete %%changelog entry\n" msgstr "" -#: build/parseChangelog.c:144 +#: build/parseChangelog.c:148 msgid "bad date in %%changelog: %s\n" msgstr "" -#: build/parseChangelog.c:149 +#: build/parseChangelog.c:153 msgid "%%changelog not in decending chronological order\n" msgstr "" -#: build/parseChangelog.c:157 build/parseChangelog.c:168 +#: build/parseChangelog.c:161 build/parseChangelog.c:172 msgid "missing name in %%changelog\n" msgstr "" -#: build/parseChangelog.c:175 +#: build/parseChangelog.c:179 msgid "no description in %%changelog\n" msgstr "" @@ -1931,17 +1931,17 @@ msgstr "" msgid "line %d: Error parsing %%description: %s\n" msgstr "" -#: build/parseDescription.c:52 build/parseFiles.c:49 build/parseScript.c:187 +#: build/parseDescription.c:52 build/parseFiles.c:50 build/parseScript.c:190 #, c-format msgid "line %d: Bad option %s: %s\n" msgstr "" -#: build/parseDescription.c:65 build/parseFiles.c:61 build/parseScript.c:199 +#: build/parseDescription.c:65 build/parseFiles.c:62 build/parseScript.c:202 #, c-format msgid "line %d: Too many names: %s\n" msgstr "" -#: build/parseDescription.c:75 build/parseFiles.c:70 build/parseScript.c:208 +#: build/parseDescription.c:75 build/parseFiles.c:71 build/parseScript.c:211 #, c-format msgid "line %d: Package does not exist: %s\n" msgstr "" @@ -1951,126 +1951,126 @@ msgstr "" msgid "line %d: Second description\n" msgstr "" -#: build/parseFiles.c:35 +#: build/parseFiles.c:36 msgid "line %d: Error parsing %%files: %s\n" msgstr "" -#: build/parseFiles.c:77 +#: build/parseFiles.c:78 msgid "line %d: Second %%files list\n" msgstr "" -#: build/parsePreamble.c:216 +#: build/parsePreamble.c:218 #, c-format msgid "Architecture is excluded: %s\n" msgstr "" -#: build/parsePreamble.c:221 +#: build/parsePreamble.c:223 #, c-format msgid "Architecture is not included: %s\n" msgstr "" -#: build/parsePreamble.c:226 +#: build/parsePreamble.c:228 #, c-format msgid "OS is excluded: %s\n" msgstr "" -#: build/parsePreamble.c:231 +#: build/parsePreamble.c:233 #, c-format msgid "OS is not included: %s\n" msgstr "" -#: build/parsePreamble.c:248 +#: build/parsePreamble.c:250 #, c-format msgid "%s field must be present in package: %s\n" msgstr "" -#: build/parsePreamble.c:275 +#: build/parsePreamble.c:277 #, c-format msgid "Duplicate %s entries in package: %s\n" msgstr "" -#: build/parsePreamble.c:329 +#: build/parsePreamble.c:331 #, c-format msgid "Unable to open icon %s: %s\n" msgstr "" -#: build/parsePreamble.c:347 +#: build/parsePreamble.c:349 #, c-format msgid "Unable to read icon %s: %s\n" msgstr "" -#: build/parsePreamble.c:360 +#: build/parsePreamble.c:362 #, c-format msgid "Unknown icon type: %s\n" msgstr "" -#: build/parsePreamble.c:431 +#: build/parsePreamble.c:435 #, c-format msgid "line %d: Malformed tag: %s\n" msgstr "" #. Empty field -#: build/parsePreamble.c:439 +#: build/parsePreamble.c:443 #, c-format msgid "line %d: Empty tag: %s\n" msgstr "" -#: build/parsePreamble.c:461 build/parsePreamble.c:468 +#: build/parsePreamble.c:465 build/parsePreamble.c:472 #, c-format msgid "line %d: Illegal char '-' in %s: %s\n" msgstr "" -#: build/parsePreamble.c:525 build/parseSpec.c:388 +#: build/parsePreamble.c:529 build/parseSpec.c:389 #, c-format msgid "BuildRoot can not be \"/\": %s\n" msgstr "" -#: build/parsePreamble.c:538 +#: build/parsePreamble.c:542 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s\n" msgstr "" -#: build/parsePreamble.c:550 +#: build/parsePreamble.c:554 #, c-format msgid "line %d: Docdir must begin with '/': %s\n" msgstr "" -#: build/parsePreamble.c:562 +#: build/parsePreamble.c:566 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s\n" msgstr "" -#: build/parsePreamble.c:602 build/parsePreamble.c:613 +#: build/parsePreamble.c:606 build/parsePreamble.c:617 #, c-format msgid "line %d: Bad %s: qualifiers: %s\n" msgstr "" -#: build/parsePreamble.c:639 +#: build/parsePreamble.c:643 #, c-format msgid "line %d: Bad BuildArchitecture format: %s\n" msgstr "" -#: build/parsePreamble.c:648 +#: build/parsePreamble.c:652 #, c-format msgid "Internal error: Bogus tag %d\n" msgstr "" -#: build/parsePreamble.c:792 +#: build/parsePreamble.c:802 #, c-format msgid "Bad package specification: %s\n" msgstr "" -#: build/parsePreamble.c:798 +#: build/parsePreamble.c:808 #, c-format msgid "Package already exists: %s\n" msgstr "" -#: build/parsePreamble.c:824 +#: build/parsePreamble.c:835 #, c-format msgid "line %d: Unknown tag: %s\n" msgstr "" -#: build/parsePreamble.c:846 +#: build/parsePreamble.c:857 msgid "Spec file can't use BuildRoot\n" msgstr "" @@ -2099,7 +2099,7 @@ msgid "Error parsing %%setup: %s\n" msgstr "" #: build/parsePrep.c:298 -msgid "line %d: Bad arg to %%setup %c: %s\n" +msgid "line %d: Bad arg to %%setup: %s\n" msgstr "" #: build/parsePrep.c:316 @@ -2155,22 +2155,22 @@ msgstr "" msgid "line %d: Version required: %s\n" msgstr "" -#: build/parseScript.c:153 +#: build/parseScript.c:156 #, c-format msgid "line %d: triggers must have --: %s\n" msgstr "" -#: build/parseScript.c:163 build/parseScript.c:224 +#: build/parseScript.c:166 build/parseScript.c:227 #, c-format msgid "line %d: Error parsing %s: %s\n" msgstr "" -#: build/parseScript.c:174 +#: build/parseScript.c:177 #, c-format msgid "line %d: script program must begin with '/': %s\n" msgstr "" -#: build/parseScript.c:216 +#: build/parseScript.c:219 #, c-format msgid "line %d: Second %s\n" msgstr "" @@ -2186,46 +2186,46 @@ msgstr "" msgid "Unable to open %s: %s\n" msgstr "" -#: build/parseSpec.c:199 +#: build/parseSpec.c:200 msgid "Unclosed %%if\n" msgstr "" -#: build/parseSpec.c:271 +#: build/parseSpec.c:272 #, c-format msgid "%s:%d: parseExpressionBoolean returns %d\n" msgstr "" -#: build/parseSpec.c:280 +#: build/parseSpec.c:281 msgid "%s:%d: Got a %%else with no %%if\n" msgstr "" -#: build/parseSpec.c:292 +#: build/parseSpec.c:293 msgid "%s:%d: Got a %%endif with no %%if\n" msgstr "" -#: build/parseSpec.c:306 build/parseSpec.c:315 +#: build/parseSpec.c:307 build/parseSpec.c:316 msgid "malformed %%include statement\n" msgstr "" -#: build/parseSpec.c:495 -msgid "No buildable architectures\n" +#: build/parseSpec.c:505 +msgid "No compatible architectures found for build\n" msgstr "" -#: build/parseSpec.c:550 +#: build/parseSpec.c:559 msgid "Package has no %%description: %s\n" msgstr "" -#: build/spec.c:218 +#: build/spec.c:225 #, c-format msgid "line %d: Bad number: %s\n" msgstr "" -#: build/spec.c:224 +#: build/spec.c:231 #, c-format msgid "line %d: Bad no%s number: %d\n" msgstr "" -#: build/spec.c:282 +#: build/spec.c:290 #, c-format msgid "line %d: Bad %s number: %s\n" msgstr "" @@ -2277,203 +2277,203 @@ msgstr "" msgid "db%d error(%d): %s\n" msgstr "" -#: lib/db1.c:414 +#: lib/db1.c:418 #, c-format msgid "closed db file %s\n" msgstr "" -#: lib/db1.c:417 +#: lib/db1.c:421 #, c-format msgid "removed db file %s\n" msgstr "" -#: lib/db1.c:448 +#: lib/db1.c:452 #, c-format msgid "bad db file %s\n" msgstr "" -#: lib/db1.c:453 +#: lib/db1.c:457 #, c-format msgid "opening db file %s mode 0x%x\n" msgstr "" #. XXX check errno validity -#: lib/db1.c:476 +#: lib/db1.c:480 #, c-format msgid "cannot get %s lock on database\n" msgstr "" -#: lib/db1.c:477 lib/db2.c:787 lib/db3.c:778 +#: lib/db1.c:481 lib/db2.c:787 lib/db3.c:798 msgid "exclusive" msgstr "" -#: lib/db1.c:477 lib/db2.c:787 lib/db3.c:778 +#: lib/db1.c:481 lib/db2.c:787 lib/db3.c:798 msgid "shared" msgstr "" -#: lib/db2.c:145 lib/db3.c:130 +#: lib/db2.c:145 lib/db3.c:131 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: lib/db2.c:161 lib/db3.c:146 +#: lib/db2.c:161 lib/db3.c:147 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: lib/db2.c:198 lib/db3.c:183 +#: lib/db2.c:198 lib/db3.c:186 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: lib/db2.c:588 lib/db3.c:575 +#: lib/db2.c:588 lib/db3.c:591 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: lib/db2.c:679 lib/db3.c:666 +#: lib/db2.c:679 lib/db3.c:686 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: lib/db2.c:785 lib/db3.c:776 +#: lib/db2.c:785 lib/db3.c:796 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: lib/db2.c:792 lib/db3.c:783 +#: lib/db2.c:792 lib/db3.c:803 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: lib/dbconfig.c:258 +#: lib/dbconfig.c:260 #, c-format msgid "unrecognized db option: \"%s\" ignored\n" msgstr "" -#: lib/dbconfig.c:287 +#: lib/dbconfig.c:289 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: lib/dbconfig.c:296 +#: lib/dbconfig.c:298 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: lib/dbconfig.c:305 +#: lib/dbconfig.c:307 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:563 +#: lib/depends.c:565 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:592 +#: lib/depends.c:594 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:593 lib/depends.c:1065 lib/depends.c:1188 +#: lib/depends.c:595 lib/depends.c:1075 lib/depends.c:1200 msgid "YES" msgstr "" -#: lib/depends.c:593 lib/depends.c:1065 lib/depends.c:1188 +#: lib/depends.c:595 lib/depends.c:1075 lib/depends.c:1200 msgid "NO " msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:964 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1012 +#: lib/depends.c:1022 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1064 +#: lib/depends.c:1074 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1083 +#: lib/depends.c:1095 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1100 +#: lib/depends.c:1112 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1122 +#: lib/depends.c:1134 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1135 +#: lib/depends.c:1147 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1149 +#: lib/depends.c:1161 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1167 +#: lib/depends.c:1179 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1188 +#: lib/depends.c:1200 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" #. requirements are not satisfied. -#: lib/depends.c:1249 +#: lib/depends.c:1261 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1317 +#: lib/depends.c:1329 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1532 +#: lib/depends.c:1549 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1675 +#: lib/depends.c:1697 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1727 +#: lib/depends.c:1755 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1776 +#: lib/depends.c:1807 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1825 +#: lib/depends.c:1859 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1853 +#: lib/depends.c:1888 msgid "========== continuing tsort ...\n" msgstr "" @@ -2488,7 +2488,7 @@ msgid "" msgstr "" #: lib/formats.c:28 lib/formats.c:54 lib/formats.c:83 lib/formats.c:124 -#: lib/header.c:2645 lib/header.c:2662 lib/header.c:2682 +#: lib/header.c:2667 lib/header.c:2684 lib/header.c:2702 msgid "(not a number)" msgstr "" @@ -2511,7 +2511,7 @@ msgstr "" msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/fs.c:153 rpmio/url.c:457 +#: lib/fs.c:153 rpmio/url.c:475 #, c-format msgid "failed to open %s: %s\n" msgstr "" @@ -2521,41 +2521,41 @@ msgstr "" msgid "file %s is on an unknown device\n" msgstr "" -#: lib/fsm.c:266 +#: lib/fsm.c:280 msgid "========= Directories not explictly included in package:\n" msgstr "" -#: lib/fsm.c:268 +#: lib/fsm.c:282 #, c-format msgid "%9d %s\n" msgstr "" -#: lib/fsm.c:1052 +#: lib/fsm.c:1089 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1359 lib/fsm.c:1480 +#: lib/fsm.c:1398 lib/fsm.c:1523 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1506 +#: lib/fsm.c:1549 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1512 +#: lib/fsm.c:1555 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1522 +#: lib/fsm.c:1565 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1541 +#: lib/fsm.c:1584 #, c-format msgid "%s created as %s\n" msgstr "" @@ -2565,88 +2565,88 @@ msgstr "" msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" -#: lib/header.c:208 lib/header.c:1115 lib/psm.c:368 +#: lib/header.c:208 lib/header.c:1120 lib/psm.c:372 #, c-format msgid "Data type %d not supported\n" msgstr "" -#: lib/header.c:1540 +#: lib/header.c:1555 #, c-format msgid "Bad count for headerAddEntry(): %d\n" msgstr "" #. @-observertrans@ -#: lib/header.c:1993 +#: lib/header.c:2014 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans@ -#: lib/header.c:2023 +#: lib/header.c:2044 msgid "missing } after %{" msgstr "" #. @-observertrans@ -#: lib/header.c:2037 +#: lib/header.c:2058 msgid "empty tag format" msgstr "" #. @-observertrans@ -#: lib/header.c:2049 +#: lib/header.c:2070 msgid "empty tag name" msgstr "" #. @-observertrans@ -#: lib/header.c:2066 +#: lib/header.c:2087 msgid "unknown tag" msgstr "" #. @-observertrans@ -#: lib/header.c:2093 +#: lib/header.c:2114 msgid "] expected at end of array" msgstr "" #. @-observertrans@ -#: lib/header.c:2111 +#: lib/header.c:2132 msgid "unexpected ]" msgstr "" #. @-observertrans@ -#: lib/header.c:2115 +#: lib/header.c:2136 msgid "unexpected }" msgstr "" #. @-observertrans@ -#: lib/header.c:2177 +#: lib/header.c:2199 msgid "? expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2186 +#: lib/header.c:2208 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2199 lib/header.c:2241 +#: lib/header.c:2221 lib/header.c:2263 msgid "} expected in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2209 +#: lib/header.c:2231 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans@ -#: lib/header.c:2226 +#: lib/header.c:2248 msgid "{ expected after : in expression" msgstr "" #. @-observertrans@ -#: lib/header.c:2251 +#: lib/header.c:2273 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2422 +#: lib/header.c:2444 msgid "(unknown type)" msgstr "" @@ -2655,11 +2655,11 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:122 +#: lib/package.c:124 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:184 +#: lib/package.c:186 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" @@ -2933,185 +2933,185 @@ msgstr "" msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:555 +#: lib/psm.c:559 #, c-format msgid "cannot create %s %s\n" msgstr "" -#: lib/psm.c:561 +#: lib/psm.c:565 #, c-format msgid "cannot write to %s\n" msgstr "" -#: lib/psm.c:598 +#: lib/psm.c:602 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:702 +#: lib/psm.c:710 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:951 +#: lib/psm.c:960 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:958 +#: lib/psm.c:967 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1266 +#: lib/psm.c:1275 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1380 +#: lib/psm.c:1389 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:1486 +#: lib/psm.c:1497 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1495 +#: lib/psm.c:1506 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1524 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1525 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1777 +#: lib/psm.c:1811 #, c-format msgid "%s: running %s script(s) (if any)\n" msgstr "" -#: lib/query.c:113 +#: lib/query.c:115 #, c-format msgid "incorrect format: %s\n" msgstr "" -#: lib/query.c:201 +#: lib/query.c:203 msgid "(contains no files)" msgstr "" -#: lib/query.c:249 +#: lib/query.c:251 msgid "normal " msgstr "" -#: lib/query.c:251 +#: lib/query.c:253 msgid "replaced " msgstr "" -#: lib/query.c:253 +#: lib/query.c:255 msgid "not installed " msgstr "" -#: lib/query.c:255 +#: lib/query.c:257 msgid "net shared " msgstr "" -#: lib/query.c:257 +#: lib/query.c:259 #, c-format msgid "(unknown %3d) " msgstr "" -#: lib/query.c:262 +#: lib/query.c:264 msgid "(no state) " msgstr "" -#: lib/query.c:281 lib/query.c:326 +#: lib/query.c:283 lib/query.c:328 msgid "package has neither file owner or id lists\n" msgstr "" -#: lib/query.c:385 +#: lib/query.c:387 #, c-format msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:511 lib/query.c:543 lib/rpminstall.c:313 lib/rpminstall.c:444 +#: lib/query.c:513 lib/query.c:545 lib/rpminstall.c:321 lib/rpminstall.c:452 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:522 +#: lib/query.c:524 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:528 +#: lib/query.c:530 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:553 lib/rpminstall.c:454 +#: lib/query.c:555 lib/rpminstall.c:462 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:596 +#: lib/query.c:598 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:619 +#: lib/query.c:620 msgid "no packages\n" msgstr "" -#: lib/query.c:630 +#: lib/query.c:631 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:640 +#: lib/query.c:641 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:650 +#: lib/query.c:651 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:661 +#: lib/query.c:662 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:692 +#: lib/query.c:696 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:696 +#: lib/query.c:700 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:722 +#: lib/query.c:726 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:725 +#: lib/query.c:729 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:730 +#: lib/query.c:734 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:741 lib/rpminstall.c:589 +#: lib/query.c:745 lib/rpminstall.c:599 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3135,306 +3135,306 @@ msgstr "" msgid "%s: Fread failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:125 lib/rpmchecksig.c:258 +#: lib/rpmchecksig.c:127 lib/rpmchecksig.c:262 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/rpmchecksig.c:130 +#: lib/rpmchecksig.c:132 #, c-format msgid "%s: Can't sign v1.0 RPM\n" msgstr "" -#: lib/rpmchecksig.c:134 +#: lib/rpmchecksig.c:136 #, c-format msgid "%s: Can't re-sign v2.0 RPM\n" msgstr "" -#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:274 +#: lib/rpmchecksig.c:145 lib/rpmchecksig.c:278 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/rpmchecksig.c:147 lib/rpmchecksig.c:279 +#: lib/rpmchecksig.c:149 lib/rpmchecksig.c:283 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/rpmchecksig.c:180 +#: lib/rpmchecksig.c:182 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:186 +#: lib/rpmchecksig.c:188 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:264 +#: lib/rpmchecksig.c:268 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:434 +#: lib/rpmchecksig.c:439 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449 +#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451 +#: lib/rpmchecksig.c:442 lib/rpmchecksig.c:456 msgid ") " msgstr "" -#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452 +#: lib/rpmchecksig.c:443 lib/rpmchecksig.c:457 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454 +#: lib/rpmchecksig.c:445 lib/rpmchecksig.c:459 msgid ")" msgstr "" -#: lib/rpmchecksig.c:448 +#: lib/rpmchecksig.c:453 msgid "OK" msgstr "" -#: lib/rpmdb.c:100 +#: lib/rpmdb.c:102 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: lib/rpmdb.c:270 +#: lib/rpmdb.c:280 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: lib/rpmdb.c:290 +#: lib/rpmdb.c:300 #, c-format msgid "cannot open %s index\n" msgstr "" -#: lib/rpmdb.c:376 +#: lib/rpmdb.c:386 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: lib/rpmdb.c:500 +#: lib/rpmdb.c:511 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: lib/rpmdb.c:510 +#: lib/rpmdb.c:521 #, c-format msgid "error(%d) removing record %s from %s\n" msgstr "" -#: lib/rpmdb.c:737 +#: lib/rpmdb.c:753 msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:831 +#: lib/rpmdb.c:854 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: lib/rpmdb.c:1012 +#: lib/rpmdb.c:1044 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: lib/rpmdb.c:1068 lib/rpmdb.c:1626 +#: lib/rpmdb.c:1100 lib/rpmdb.c:1662 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:1333 lib/rpmdb.c:2444 +#: lib/rpmdb.c:1365 lib/rpmdb.c:2505 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:1689 +#: lib/rpmdb.c:1729 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1698 +#: lib/rpmdb.c:1738 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: lib/rpmdb.c:1885 +#: lib/rpmdb.c:1928 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: lib/rpmdb.c:1958 +#: lib/rpmdb.c:2006 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1969 +#: lib/rpmdb.c:2017 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: lib/rpmdb.c:2340 +#: lib/rpmdb.c:2399 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: lib/rpmdb.c:2366 +#: lib/rpmdb.c:2427 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2391 +#: lib/rpmdb.c:2452 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2395 +#: lib/rpmdb.c:2456 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: lib/rpmdb.c:2401 +#: lib/rpmdb.c:2462 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2403 +#: lib/rpmdb.c:2464 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2410 +#: lib/rpmdb.c:2471 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2421 +#: lib/rpmdb.c:2482 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2483 +#: lib/rpmdb.c:2544 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2501 +#: lib/rpmdb.c:2562 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2509 +#: lib/rpmdb.c:2570 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2511 +#: lib/rpmdb.c:2572 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2521 +#: lib/rpmdb.c:2582 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2523 +#: lib/rpmdb.c:2584 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:159 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:161 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:264 +#: lib/rpminstall.c:272 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:282 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:278 +#: lib/rpminstall.c:286 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:350 +#: lib/rpminstall.c:358 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/rpminstall.c:372 +#: lib/rpminstall.c:380 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:418 +#: lib/rpminstall.c:426 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:424 +#: lib/rpminstall.c:432 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:436 lib/rpminstall.c:657 +#: lib/rpminstall.c:444 lib/rpminstall.c:670 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:468 +#: lib/rpminstall.c:476 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:483 +#: lib/rpminstall.c:491 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:504 +#: lib/rpminstall.c:512 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:522 +#: lib/rpminstall.c:530 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:576 +#: lib/rpminstall.c:586 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:602 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:615 +#: lib/rpminstall.c:625 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:644 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:650 +#: lib/rpminstall.c:660 #, c-format msgid "Installing %s\n" msgstr "" @@ -3444,259 +3444,259 @@ msgstr "" msgid "read failed: %s (%d)\n" msgstr "" -#: lib/rpmrc.c:152 +#: lib/rpmrc.c:156 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "" -#: lib/rpmrc.c:155 +#: lib/rpmrc.c:159 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "" -#: lib/rpmrc.c:307 +#: lib/rpmrc.c:314 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:312 +#: lib/rpmrc.c:319 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:319 +#: lib/rpmrc.c:327 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "" -#: lib/rpmrc.c:357 +#: lib/rpmrc.c:366 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:362 +#: lib/rpmrc.c:371 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:555 +#: lib/rpmrc.c:568 #, c-format msgid "Cannot expand %s\n" msgstr "" -#: lib/rpmrc.c:560 +#: lib/rpmrc.c:573 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:590 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "" #. XXX Feof(fd) -#: lib/rpmrc.c:622 +#: lib/rpmrc.c:636 #, c-format msgid "Failed to read %s: %s.\n" msgstr "" -#: lib/rpmrc.c:659 +#: lib/rpmrc.c:673 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "" -#: lib/rpmrc.c:676 lib/rpmrc.c:750 +#: lib/rpmrc.c:690 lib/rpmrc.c:764 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "" -#: lib/rpmrc.c:693 lib/rpmrc.c:715 +#: lib/rpmrc.c:707 lib/rpmrc.c:729 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "" -#: lib/rpmrc.c:702 +#: lib/rpmrc.c:716 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "" -#: lib/rpmrc.c:742 +#: lib/rpmrc.c:756 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "" -#: lib/rpmrc.c:809 +#: lib/rpmrc.c:823 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "" -#: lib/rpmrc.c:1352 +#: lib/rpmrc.c:1378 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1353 +#: lib/rpmrc.c:1379 msgid "Please contact rpm-list@redhat.com\n" msgstr "" -#: lib/signature.c:125 +#: lib/signature.c:126 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:134 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:137 +#: lib/signature.c:138 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:156 +#: lib/signature.c:157 msgid "No signature\n" msgstr "" -#: lib/signature.c:160 +#: lib/signature.c:161 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:171 +#: lib/signature.c:172 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:225 +#: lib/signature.c:228 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:284 +#: lib/signature.c:287 #, c-format msgid "Couldn't exec pgp (%s)\n" msgstr "" -#: lib/signature.c:295 +#: lib/signature.c:300 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:302 +#: lib/signature.c:307 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:307 +#: lib/signature.c:312 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:318 lib/signature.c:395 +#: lib/signature.c:325 lib/signature.c:406 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:323 +#: lib/signature.c:330 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:361 lib/signature.c:707 +#: lib/signature.c:368 lib/signature.c:726 msgid "Couldn't exec gpg\n" msgstr "" -#: lib/signature.c:372 +#: lib/signature.c:381 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:379 +#: lib/signature.c:388 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:384 +#: lib/signature.c:393 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:400 +#: lib/signature.c:411 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" -#: lib/signature.c:428 +#: lib/signature.c:439 msgid "Generating signature using PGP.\n" msgstr "" -#: lib/signature.c:434 +#: lib/signature.c:445 msgid "Generating signature using GPG.\n" msgstr "" -#: lib/signature.c:514 lib/signature.c:575 +#: lib/signature.c:525 lib/signature.c:588 msgid "Could not run pgp. Use --nopgp to skip PGP checks.\n" msgstr "" -#: lib/signature.c:648 +#: lib/signature.c:665 msgid "Could not run gpg. Use --nogpg to skip GPG checks.\n" msgstr "" -#: lib/signature.c:736 +#: lib/signature.c:755 msgid "Couldn't exec pgp\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:740 lib/signature.c:793 +#: lib/signature.c:759 lib/signature.c:812 msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:773 +#: lib/signature.c:792 msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:785 +#: lib/signature.c:804 msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/transaction.c:414 +#: lib/transaction.c:419 msgid "========== relocations\n" msgstr "" -#: lib/transaction.c:417 +#: lib/transaction.c:423 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/transaction.c:420 +#: lib/transaction.c:426 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/transaction.c:489 +#: lib/transaction.c:496 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/transaction.c:551 +#: lib/transaction.c:559 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/transaction.c:561 +#: lib/transaction.c:569 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/transaction.c:636 +#: lib/transaction.c:647 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/transaction.c:765 +#: lib/transaction.c:778 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/transaction.c:1352 +#: lib/transaction.c:1367 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3727,161 +3727,161 @@ msgstr "" msgid "Unsatisfied dependencies for %s-%s-%s: " msgstr "" -#: rpmio/macro.c:187 +#: rpmio/macro.c:201 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:303 +#: rpmio/macro.c:319 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:344 +#: rpmio/macro.c:360 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:560 +#: rpmio/macro.c:576 msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:587 +#: rpmio/macro.c:603 msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:594 +#: rpmio/macro.c:610 msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:599 +#: rpmio/macro.c:615 msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:604 +#: rpmio/macro.c:620 msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:636 +#: rpmio/macro.c:652 msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:732 +#: rpmio/macro.c:757 msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:825 +#: rpmio/macro.c:851 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1005 +#: rpmio/macro.c:1035 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1072 rpmio/macro.c:1089 +#: rpmio/macro.c:1102 rpmio/macro.c:1119 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1130 +#: rpmio/macro.c:1160 msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1257 +#: rpmio/macro.c:1287 msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1334 +#: rpmio/macro.c:1363 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1522 rpmio/macro.c:1528 +#: rpmio/macro.c:1548 rpmio/macro.c:1554 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1531 +#: rpmio/macro.c:1557 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:549 +#: rpmio/rpmio.c:555 msgid "Success" msgstr "" -#: rpmio/rpmio.c:552 +#: rpmio/rpmio.c:558 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:555 +#: rpmio/rpmio.c:561 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:558 +#: rpmio/rpmio.c:564 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:561 +#: rpmio/rpmio.c:567 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:564 +#: rpmio/rpmio.c:570 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:567 +#: rpmio/rpmio.c:573 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:570 +#: rpmio/rpmio.c:576 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:573 +#: rpmio/rpmio.c:579 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:576 +#: rpmio/rpmio.c:582 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:579 +#: rpmio/rpmio.c:585 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:582 +#: rpmio/rpmio.c:588 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:586 +#: rpmio/rpmio.c:592 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1194 +#: rpmio/rpmio.c:1203 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" -#: rpmio/rpmlog.c:32 +#: rpmio/rpmlog.c:42 msgid "(no error)" msgstr "" #. !< RPMLOG_EMERG -#: rpmio/rpmlog.c:91 rpmio/rpmlog.c:92 rpmio/rpmlog.c:93 +#: rpmio/rpmlog.c:97 rpmio/rpmlog.c:98 rpmio/rpmlog.c:99 msgid "fatal error: " msgstr "" #. !< RPMLOG_CRIT -#: rpmio/rpmlog.c:94 +#: rpmio/rpmlog.c:100 msgid "error: " msgstr "" #. !< RPMLOG_ERR -#: rpmio/rpmlog.c:95 +#: rpmio/rpmlog.c:101 msgid "warning: " msgstr "" @@ -3890,37 +3890,37 @@ msgstr "" msgid "memory alloc (%u bytes) returned NULL.\n" msgstr "" -#: rpmio/url.c:91 +#: rpmio/url.c:101 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:110 +#: rpmio/url.c:121 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: rpmio/url.c:138 +#: rpmio/url.c:149 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: rpmio/url.c:229 +#: rpmio/url.c:246 #, c-format msgid "Password for %s@%s: " msgstr "" -#: rpmio/url.c:253 rpmio/url.c:279 +#: rpmio/url.c:271 rpmio/url.c:297 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: rpmio/url.c:417 +#: rpmio/url.c:435 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: rpmio/url.c:474 +#: rpmio/url.c:495 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/python/Makefile.am b/python/Makefile.am index fff5841..a5ba09f 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -2,13 +2,20 @@ AUTOMAKE_OPTIONS = 1.4 foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/rpmio \ - -I$(top_srcdir)/popt -I/usr/include/python1.5 @INCPATH@ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + -I$(top_srcdir)/popt \ + -I/usr/include/python1.5 \ + @INCPATH@ EXTRA_DIST = hash.h upgrade.h mylibs= \ $(top_builddir)/lib/librpm.la \ - $(top_builddir)/lib/librpmio.la \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/popt/libpopt.la LDADD = @@ -16,11 +23,7 @@ LDADD = pythondir = $(prefix)/lib/python1.5/site-packages python_PROGRAMS = rpmmodule.so rpmmodule_so_SOURCES = -# XXX rpmmodule_so_LDFLAGS = -L../lib/.libs -lrpm -L../popt/.libs -lpopt $(LIBS) -shared -Wl,-soname,rpmmodule.so -rpmmodule_so_LDFLAGS = $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmio/librpmio.la \ - $(top_builddir)/popt/libpopt.la \ - $(LIBS) -shared -Wl,-soname,rpmmodule.so +rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so noinst_LTLIBRARIES = librpmmodule.la librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c diff --git a/python/Makefile.in b/python/Makefile.in index 03f12df..a3fbc6c 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -176,11 +176,11 @@ varprefix = @varprefix@ AUTOMAKE_OPTIONS = 1.4 foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/rpmio -I$(top_srcdir)/popt -I/usr/include/python1.5 @INCPATH@ +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/rpmdb -I$(top_srcdir)/rpmio -I$(top_srcdir)/popt -I/usr/include/python1.5 @INCPATH@ EXTRA_DIST = hash.h upgrade.h -mylibs = $(top_builddir)/lib/librpm.la $(top_builddir)/lib/librpmio.la $(top_builddir)/popt/libpopt.la +mylibs = $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la LDADD = @@ -188,9 +188,7 @@ LDADD = pythondir = $(prefix)/lib/python1.5/site-packages python_PROGRAMS = rpmmodule.so rpmmodule_so_SOURCES = -# XXX rpmmodule_so_LDFLAGS = -L../lib/.libs -lrpm -L../popt/.libs -lpopt $(LIBS) -shared -Wl,-soname,rpmmodule.so -rpmmodule_so_LDFLAGS = $(top_builddir)/lib/librpm.la $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la $(LIBS) -shared -Wl,-soname,rpmmodule.so - +rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so noinst_LTLIBRARIES = librpmmodule.la librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c diff --git a/rpm.spec.in b/rpm.spec.in index f37fee9..a7b60aa 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -206,6 +206,7 @@ fi %{__prefix}/bin/rpmquery %{__prefix}/bin/rpmverify %{__prefix}/lib/librpm.so.* +%{__prefix}/lib/librpmdb.so.* %{__prefix}/lib/librpmio.so.* %{__prefix}/lib/librpmbuild.so.* @@ -214,8 +215,7 @@ fi %{__prefix}/lib/rpm/convertrpmrc.sh %{__prefix}/lib/rpm/macros %{__prefix}/lib/rpm/mkinstalldirs -%{__prefix}/lib/rpm/rpmdb -%{__prefix}/lib/rpm/rpm[eiukqv] +%{__prefix}/lib/rpm/rpm[deiukqv] %{__prefix}/lib/rpm/rpmpopt* %{__prefix}/lib/rpm/rpmrc @@ -312,6 +312,9 @@ fi %{__prefix}/lib/librpm.a %{__prefix}/lib/librpm.la %{__prefix}/lib/librpm.so +%{__prefix}/lib/librpmdb.a +%{__prefix}/lib/librpmdb.la +%{__prefix}/lib/librpmdb.so %{__prefix}/lib/librpmio.a %{__prefix}/lib/librpmio.la %{__prefix}/lib/librpmio.so diff --git a/rpmdb/.cvsignore b/rpmdb/.cvsignore new file mode 100644 index 0000000..dcf4bef --- /dev/null +++ b/rpmdb/.cvsignore @@ -0,0 +1,7 @@ +.deps +.depend +Makefile +Makefile.in +.libs +*.la +*.lo diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am new file mode 100644 index 0000000..c647acf --- /dev/null +++ b/rpmdb/Makefile.am @@ -0,0 +1,87 @@ +# Makefile for rpm library. + +AUTOMAKE_OPTIONS = 1.4 foreign + +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmio \ + -I$(top_srcdir)/popt \ + @INCPATH@ + +EXTRA_DIST = db3.c db2.c db1.c falloc.c + +pkgincdir = $(pkgincludedir) +pkginc_HEADERS = rpmdb.h +noinst_HEADERS = falloc.h + +mylibpaths = \ + -L$(top_builddir)/lib/.libs \ + -L$(top_builddir)/rpmio/.libs \ + -L$(top_builddir)/popt/.libs + +mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@ +LIBS = + +DB3LOBJS= \ + mut_tas.lo bt_compare.lo bt_conv.lo \ + bt_curadj.lo bt_cursor.lo bt_delete.lo bt_method.lo bt_open.lo \ + bt_put.lo bt_rec.lo bt_reclaim.lo bt_recno.lo bt_rsearch.lo \ + bt_search.lo bt_split.lo bt_stat.lo bt_upgrade.lo bt_verify.lo \ + btree_auto.lo crdel_auto.lo crdel_rec.lo db.lo db_am.lo db_auto.lo \ + db_byteorder.lo db_cam.lo db_conv.lo db_dispatch.lo db_dup.lo \ + db_err.lo db_getlong.lo db_iface.lo db_join.lo db_log2.lo \ + db_meta.lo db_method.lo db_overflow.lo db_pr.lo db_rec.lo \ + db_reclaim.lo db_ret.lo db_salloc.lo db_shash.lo db_upg.lo \ + db_upg_opd.lo db_vrfy.lo db_vrfyutil.lo dbm.lo env_method.lo \ + env_open.lo env_recover.lo env_region.lo hash.lo hash_auto.lo \ + hash_conv.lo hash_dup.lo hash_func.lo hash_meta.lo hash_method.lo \ + hash_page.lo hash_rec.lo hash_reclaim.lo hash_stat.lo hash_upgrade.lo \ + hash_verify.lo hsearch.lo lock.lo lock_conflict.lo \ + lock_deadlock.lo lock_method.lo lock_region.lo lock_stat.lo \ + lock_util.lo log.lo log_archive.lo log_auto.lo log_compare.lo \ + log_findckp.lo log_get.lo log_method.lo log_put.lo log_rec.lo \ + log_register.lo mp_alloc.lo mp_bh.lo mp_fget.lo mp_fopen.lo \ + mp_fput.lo mp_fset.lo mp_method.lo mp_region.lo mp_register.lo \ + mp_stat.lo mp_sync.lo mp_trickle.lo mutex.lo os_abs.lo \ + os_alloc.lo os_dir.lo os_errno.lo os_fid.lo os_finit.lo \ + os_fsync.lo os_handle.lo os_map.lo os_method.lo os_oflags.lo \ + os_open.lo os_region.lo os_rename.lo os_root.lo os_rpath.lo \ + os_rw.lo os_seek.lo os_sleep.lo os_spin.lo os_stat.lo \ + os_tmpdir.lo os_unlink.lo qam.lo qam_auto.lo qam_conv.lo qam_files.lo \ + qam_method.lo qam_open.lo qam_rec.lo qam_stat.lo qam_upgrade.lo \ + qam_verify.lo txn.lo txn_auto.lo txn_rec.lo txn_region.lo xa.lo \ + xa_db.lo xa_map.lo + +lib_LTLIBRARIES = librpmdb.la +librpmdb_la_SOURCES = $(DBLIBSRCS) dbconfig.c rpmdb.c +librpmdb_la_LDFLAGS = @libdb3@ @libdb2@ @libdb1@ +librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) +librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) symlinkdb3 + +# XXX Add internal libtool dependence +install-data-local: + @cd $(DESTDIR)/$(libdir) && \ + sed -e "s|^dependency_libs='|& -lrpmio|" < librpmdb.la > .librpmdb.la && \ + mv .librpmdb.la librpmdb.la + +falloc.lo: falloc.c $(top_srcdir)/system.h $(top_srcdir)/rpmio/rpmio.h falloc.h + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.PHONY: symlinkdb3 +symlinkdb3: + for lo in $(DB3LOBJS); do \ + [ -e $$lo ] || $(LN_S) $(top_builddir)/$(WITH_DB_SUBDIR)/$$lo $$lo ; \ + done + +distclean-local: + rm -f $(DB3LOBJS) + +.PHONY: sources +sources: + @echo $(librpmdb_la_SOURCES:%=rpmdb/%) + +.PHONY: lclint +lclint: + lclint $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES) diff --git a/lib/db1.c b/rpmdb/db1.c similarity index 100% rename from lib/db1.c rename to rpmdb/db1.c diff --git a/lib/db2.c b/rpmdb/db2.c similarity index 100% rename from lib/db2.c rename to rpmdb/db2.c diff --git a/lib/db3.c b/rpmdb/db3.c similarity index 100% rename from lib/db3.c rename to rpmdb/db3.c diff --git a/lib/dbconfig.c b/rpmdb/dbconfig.c similarity index 100% rename from lib/dbconfig.c rename to rpmdb/dbconfig.c diff --git a/lib/falloc.c b/rpmdb/falloc.c similarity index 100% rename from lib/falloc.c rename to rpmdb/falloc.c diff --git a/lib/falloc.h b/rpmdb/falloc.h similarity index 100% rename from lib/falloc.h rename to rpmdb/falloc.h diff --git a/lib/rpmdb.c b/rpmdb/rpmdb.c similarity index 100% rename from lib/rpmdb.c rename to rpmdb/rpmdb.c diff --git a/lib/rpmdb.h b/rpmdb/rpmdb.h similarity index 100% rename from lib/rpmdb.h rename to rpmdb/rpmdb.h diff --git a/rpmpopt.in b/rpmpopt.in index 3473598..4bd30a9 100644 --- a/rpmpopt.in +++ b/rpmpopt.in @@ -136,8 +136,8 @@ rpm exec --rmspec rpmb --rmspec rpm exec --target rpmb --target rpm exec --short-circuit rpmb --short-circuit -rpm exec --initdb rpmdb --initdb -rpm exec --rebuilddb rpmdb --rebuilddb +rpm exec --initdb rpmd --initdb +rpm exec --rebuilddb rpmd --rebuilddb #rpm exec -e rpme -e #rpm exec --erase rpme --erase @@ -175,11 +175,11 @@ rpmbuild alias --timecheck --define '_timecheck !#:+' rpmbuild alias --with --define "_with_!#:+ --with-!#:+" rpmbuild alias --without --define "_without_!#:+ --without-!#:+" ============================================================================== -rpmdb alias --dbpath --define '_dbpath !#:+' -rpmdb alias --ftpport --define '_ftpport !#:+' -rpmdb alias --ftpproxy --define '_ftpproxy !#:+' -rpmdb alias --httpport --define '_httpport !#:+' -rpmdb alias --httpproxy --define '_httpproxy !#:+' +rpmd alias --dbpath --define '_dbpath !#:+' +rpmd alias --ftpport --define '_ftpport !#:+' +rpmd alias --ftpproxy --define '_ftpproxy !#:+' +rpmd alias --httpport --define '_httpport !#:+' +rpmd alias --httpproxy --define '_httpproxy !#:+' #============================================================================== rpme alias --dbpath --define '_dbpath !#:+' rpme alias --ftpport --define '_ftpport !#:+' diff --git a/tools/Makefile.am b/tools/Makefile.am index b4b5d7c..60ca245 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,9 +2,15 @@ AUTOMAKE_OPTIONS = 1.4 foreign -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib \ - -I$(top_srcdir)/rpmio -I$(top_srcdir)/popt \ - @INCPATH@ -I$(top_srcdir)/misc +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + -I$(top_srcdir)/popt \ + @INCPATH@ \ + -I$(top_srcdir)/misc EXTRA_DIST = rpmchecksig.c @@ -13,9 +19,10 @@ EXTRA_PROGRAMS = rpminject rpmsort #myLDFLAGS= -L$(top_builddir)/build -L$(top_builddir)/lib \ # -L$(top_builddir)/rpmio -L$(top_builddir)/popt -myLDADD = $(top_builddir)/build/librpmbuild.la \ +myLDADD = \ + $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ - @libdb3a@ \ + $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/popt/libpopt.la \ @INTLLIBS@ -- 2.7.4