From 2ed98fa0744f713bb1ca4d13b66197c070fdb603 Mon Sep 17 00:00:00 2001 From: jbj Date: Mon, 24 May 1999 20:37:52 +0000 Subject: [PATCH] Begin 3.0.2. CVS patchset: 3075 CVS date: 1999/05/24 20:37:52 --- CHANGES | 2 + aclocal.m4 | 337 +++++++------------------------ configure.in | 2 +- po/rpm.pot | 564 ++++++++++++++++++++++++++-------------------------- rpm.spec | 4 +- scripts/Makefile.in | 2 +- 6 files changed, 356 insertions(+), 555 deletions(-) diff --git a/CHANGES b/CHANGES index 2877b2e..49e2ed5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +3.0.1 -> 3.0.2 + 3.0 -> 3.0.1 - fix: %verifyscript resurrected. (Shing-Gene Yung). - fix: % before non-alphabetic non-macro special now passed unscathed. diff --git a/aclocal.m4 b/aclocal.m4 index 01910dc..5153b84 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -238,7 +238,7 @@ esac ]) -# serial 35 AC_PROG_LIBTOOL +# serial 39 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -247,8 +247,9 @@ AC_CACHE_SAVE # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -DLLTOOL="$DLLTOOL" AS="$AS" \ +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || AC_MSG_ERROR([libtool configure failed]) @@ -279,8 +280,6 @@ AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([AC_SYS_NM_PARSE])dnl -AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl AC_REQUIRE([AC_PROG_LN_S])dnl dnl @@ -294,10 +293,16 @@ dnl test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" -test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen" -test "$silent" = yes && libtool_flags="$libtool_flags --silent" test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" +ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], +[libtool_flags="$libtool_flags --enable-dlopen"]) +ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +[libtool_flags="$libtool_flags --enable-win32-dll"]) +AC_ARG_ENABLE(libtool-lock, + [ --disable-libtool-lock avoid locking (might break parallel builds)]) +test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" +test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" # Some flags need to be propagated to the compiler or linker for good # libtool support. @@ -333,33 +338,28 @@ case "$host" in fi ;; -*-*-cygwin*) - AC_SYS_LIBTOOL_CYGWIN +ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +[*-*-cygwin* | *-*-mingw*) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) ;; - +]) esac - -# enable the --disable-libtool-lock switch - -AC_ARG_ENABLE(libtool-lock, -[ --disable-libtool-lock force libtool not to do file locking], -need_locks=$enableval, -need_locks=yes) - -if test x"$need_locks" = xno; then - libtool_flags="$libtool_flags --disable-lock" -fi ]) -# AC_LIBTOOL_DLOPEN - check for dlopen support -AC_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes]) +# AC_LIBTOOL_DLOPEN - enable checks for dlopen support +AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) + +# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's +AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) # AC_ENABLE_SHARED - implement the --enable-shared flag # Usage: AC_ENABLE_SHARED[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_SHARED, -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +AC_DEFUN(AC_ENABLE_SHARED, [dnl +define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(shared, changequote(<<, >>)dnl << --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], @@ -384,15 +384,15 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl ]) # AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AC_DISABLE_SHARED, -[AC_ENABLE_SHARED(no)]) +AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_SHARED(no)]) # AC_ENABLE_STATIC - implement the --enable-static flag # Usage: AC_ENABLE_STATIC[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_STATIC, -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +AC_DEFUN(AC_ENABLE_STATIC, [dnl +define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(static, changequote(<<, >>)dnl << --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], @@ -417,16 +417,16 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl ]) # AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AC_DISABLE_STATIC, -[AC_ENABLE_STATIC(no)]) +AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_STATIC(no)]) # AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_FAST_INSTALL, -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl +define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(fast-install, changequote(<<, >>)dnl << --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], @@ -451,9 +451,8 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl ]) # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN(AC_DISABLE_FAST_INSTALL, -[AC_ENABLE_FAST_INSTALL(no)]) - +AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_FAST_INSTALL(no)]) # AC_PROG_LD - find the path to the GNU or non-GNU linker AC_DEFUN(AC_PROG_LD, @@ -471,7 +470,7 @@ if test "$ac_cv_prog_gcc" = yes; then case "$ac_prog" in # Accept absolute paths. changequote(,)dnl - /* | [A-Za-z]:[\\/]*) + [\\/]* | [A-Za-z]:[\\/]*) re_direlt='/[^/][^/]*/\.\./' changequote([,])dnl # Canonicalize the path of ld @@ -497,10 +496,10 @@ else fi AC_CACHE_VAL(ac_cv_path_LD, [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog"; then + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ac_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. @@ -545,10 +544,10 @@ AC_CACHE_VAL(ac_cv_path_NM, # Let the user override the test. ac_cv_path_NM="$NM" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm; then + if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then # Check to see if the nm accepts a BSD-compat flag. # Adding the `sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored @@ -572,227 +571,22 @@ AC_MSG_RESULT([$NM]) AC_SUBST(NM) ]) -# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed -# by C symbol name from nm. -AC_DEFUN(AC_SYS_NM_PARSE, +# AC_CHECK_LIBM - check for math library +AC_DEFUN(AC_CHECK_LIBM, [AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_NM])dnl -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output]) -AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe, -[# These are sane defaults that work on at least a few old systems. -# {They come from Ultrix. What could be older than Ultrix?!! ;)} - -changequote(,)dnl -# Character class describing NM global symbol codes. -ac_symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Transform the above into a raw symbol and a C symbol. -ac_symxfrm='\1 \2\3 \3' - -# Transform an extracted symbol line into a proper C declaration -ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" - -# Define system-specific variables. -case "$host_os" in -aix*) - ac_symcode='[BCDT]' - ;; -cygwin* | mingw*) - ac_symcode='[ABCDGISTW]' - ;; -hpux*) - ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'" +LIBM= +case "$host" in +*-*-beos* | *-*-cygwin*) + # These system don't have libm ;; -irix*) - ac_symcode='[BCDEGRST]' +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") ;; -solaris*) - ac_symcode='[BDT]' +*) + AC_CHECK_LIB(m, main, LIBM="-lm") ;; esac - -# If we're using GNU nm, then use its standard symbol codes. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - ac_symcode='[ABCDGISTW]' -fi -changequote([,])dnl - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($ac_symcode\)[ ][ ]*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'" - - # Check to see that the pipe works correctly. - ac_pipe_works=no - rm -f conftest.$ac_ext - cat > conftest.$ac_ext < $ac_nlist) && test -s "$ac_nlist"; then - - # Try sorting and uniquifying the output. - if sort "$ac_nlist" | uniq > "$ac_nlist"T; then - mv -f "$ac_nlist"T "$ac_nlist" - else - rm -f "$ac_nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then - if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then - cat < conftest.c -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c' - - cat <> conftest.c -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -changequote(,)dnl -lt_preloaded_symbols[] = -changequote([,])dnl -{ -EOF - sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c - cat <<\EOF >> conftest.c - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftestm.$ac_objext - ac_save_LIBS="$LIBS" - ac_save_CFLAGS="$CFLAGS" - LIBS="conftestm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" - if AC_TRY_EVAL(ac_link) && test -s conftest; then - ac_pipe_works=yes - else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC - fi - LIBS="$ac_save_LIBS" - CFLAGS="$ac_save_CFLAGS" - else - echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC - fi - else - echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC - fi - else - echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC - fi - else - echo "$progname: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC - fi - rm -rf conftest* - - # Do not use the global_symbol_pipe unless it works. - if test "$ac_pipe_works" = yes; then - if test x"$ac_symprfx" = x"_"; then - ac_cv_sys_symbol_underscore=yes - else - ac_cv_sys_symbol_underscore=no - fi - break - else - ac_cv_sys_global_symbol_pipe= - fi -done -]) - -ac_result=yes -if test -z "$ac_cv_sys_global_symbol_pipe"; then - ac_result=no -fi -AC_MSG_RESULT($ac_result) -]) - -# AC_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin -AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN, -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -AC_CHECK_TOOL(AS, as, false) -]) - -# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols -# with an underscore? -AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE, -[AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([AC_SYS_NM_PARSE])dnl -AC_MSG_CHECKING([for _ prefix in compiled symbols]) -AC_CACHE_VAL(ac_cv_sys_symbol_underscore, -[ac_cv_sys_symbol_underscore=no -cat > conftest.$ac_ext < $ac_nlist) && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then - ac_cv_sys_symbol_underscore=yes - else - if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then - : - else - echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC - fi - fi - else - echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC - fi -else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC -fi -rm -rf conftest* -]) -AC_MSG_RESULT($ac_cv_sys_symbol_underscore) -USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no} -AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl -]) - -# AC_CHECK_LIBM - check for math library -AC_DEFUN(AC_CHECK_LIBM, [ -AC_CHECK_LIB(mw, _mwvalidcheckl) -AC_CHECK_LIB(m, cos) ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for @@ -803,7 +597,7 @@ AC_CHECK_LIB(m, cos) # '${top_builddir}/' (note the single quotes!) if your package is not # flat, and, if you're not using automake, define top_builddir as # appropriate in the Makefiles. -AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [ +AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case "$enable_ltdl_convenience" in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes @@ -821,16 +615,21 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [ # flat, and, if you're not using automake, define top_builddir as # appropriate in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [ - AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [ - case "$enable_ltdl_install" in - no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;; - "") enable_ltdl_install=yes - ac_configure_args="$ac_configure_args --enable-ltdl-install" ;; - esac +AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_CHECK_LIB(ltdl, main, + [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], + [if test x"$enable_ltdl_install" = xno; then + AC_MSG_WARN([libltdl not installed, but installation disabled]) + else + enable_ltdl_install=yes + fi ]) - if test x"$enable_ltdl_install" != x"no"; then + if test x"$enable_ltdl_install" = x"yes"; then + ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + else + ac_configure_args="$ac_configure_args --enable-ltdl-install=no" + LIBLTDL="-lltdl" fi ]) @@ -842,9 +641,9 @@ AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl -AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl -AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl + +dnl This is just to quiet aclocal about the macro not being used +if(a,b,[AC_DISABLE_FAST_INSTALL])dnl dnl From Jim Meyering. Use this if you use the GNU error.[ch]. dnl FIXME: Migrate into libit diff --git a/configure.in b/configure.in index 360cbbf..db07a08 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ dnl it, why check it? AC_INIT(rpm.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(rpm, 3.0.1) +AM_INIT_AUTOMAKE(rpm, 3.0.2) AM_CONFIG_HEADER(config.h) AC_PREREQ(2.12) dnl Minimum Autoconf version required. diff --git a/po/rpm.pot b/po/rpm.pot index 2806a9a..955ef90 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-05-17 15:28-0400\n" +"POT-Creation-Date: 1999-05-24 11:40-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: ../build.c:24 ../install.c:221 ../install.c:377 +#: ../build.c:24 ../install.c:221 ../install.c:379 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -89,7 +89,7 @@ msgstr "" msgid "override build root" msgstr "" -#: ../build.c:323 ../rpm.c:458 +#: ../build.c:323 ../rpm.c:457 msgid "remove build tree when done" msgstr "" @@ -109,7 +109,7 @@ msgstr "" msgid "remove specfile when done" msgstr "" -#: ../build.c:333 ../rpm.c:456 +#: ../build.c:333 ../rpm.c:455 msgid "skip straight to specified stage (only for c,i)" msgstr "" @@ -320,7 +320,7 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: ../install.c:190 ../install.c:327 +#: ../install.c:190 ../install.c:329 #, c-format msgid "cannot open file %s\n" msgstr "" @@ -330,7 +330,7 @@ msgstr "" msgid "%s does not appear to be a RPM package\n" msgstr "" -#: ../install.c:206 ../install.c:464 +#: ../install.c:206 ../install.c:466 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -350,54 +350,54 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: ../install.c:272 +#: ../install.c:274 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: ../install.c:282 +#: ../install.c:284 msgid "failed dependencies:\n" msgstr "" -#: ../install.c:300 +#: ../install.c:302 msgid "installing binary packages\n" msgstr "" -#: ../install.c:388 ../lib/query.c:717 +#: ../install.c:390 ../lib/query.c:717 #, c-format msgid "package %s is not installed\n" msgstr "" -#: ../install.c:392 +#: ../install.c:394 #, c-format msgid "searching for package %s\n" msgstr "" -#: ../install.c:401 +#: ../install.c:403 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: ../install.c:427 +#: ../install.c:429 msgid "removing these packages would break dependencies:\n" msgstr "" -#: ../install.c:454 +#: ../install.c:456 #, c-format msgid "cannot open %s\n" msgstr "" -#: ../install.c:459 +#: ../install.c:461 #, c-format msgid "Installing %s\n" msgstr "" -#: ../install.c:503 +#: ../install.c:505 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: ../install.c:506 +#: ../install.c:508 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" @@ -415,1079 +415,1079 @@ msgstr "" msgid "no copyright!\n" msgstr "" -#: ../rpm.c:160 +#: ../rpm.c:159 #, c-format msgid "rpm: %s\n" msgstr "" -#: ../rpm.c:171 +#: ../rpm.c:170 #, c-format msgid "RPM version %s\n" msgstr "" -#: ../rpm.c:175 +#: ../rpm.c:174 msgid "Copyright (C) 1998 - Red Hat Software" msgstr "" -#: ../rpm.c:176 +#: ../rpm.c:175 msgid "" "This may be freely redistributed under the terms of the GNU Public License" msgstr "" -#: ../rpm.c:185 +#: ../rpm.c:184 msgid "usage: rpm {--help}" msgstr "" -#: ../rpm.c:186 +#: ../rpm.c:185 msgid " rpm {--version}" msgstr "" -#: ../rpm.c:187 +#: ../rpm.c:186 msgid " rpm {--initdb} [--dbpath ]" msgstr "" -#: ../rpm.c:188 +#: ../rpm.c:187 msgid "" " rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]" msgstr "" -#: ../rpm.c:189 +#: ../rpm.c:188 msgid " [--replacepkgs] [--replacefiles] [--root ]" msgstr "" -#: ../rpm.c:190 +#: ../rpm.c:189 msgid " [--excludedocs] [--includedocs] [--noscripts]" msgstr "" -#: ../rpm.c:191 +#: ../rpm.c:190 msgid "" " [--rcfile ] [--ignorearch] [--dbpath ]" msgstr "" -#: ../rpm.c:192 +#: ../rpm.c:191 msgid "" " [--prefix ] [--ignoreos] [--nodeps] [--allfiles]" msgstr "" -#: ../rpm.c:193 +#: ../rpm.c:192 msgid "" " [--ftpproxy ] [--ftpport ] [--justdb]" msgstr "" -#: ../rpm.c:194 ../rpm.c:203 ../rpm.c:212 +#: ../rpm.c:193 ../rpm.c:202 ../rpm.c:211 msgid " [--httpproxy ] [--httpport ] " msgstr "" -#: ../rpm.c:195 ../rpm.c:205 +#: ../rpm.c:194 ../rpm.c:204 msgid " [--noorder] [--relocate oldpath=newpath]" msgstr "" -#: ../rpm.c:196 +#: ../rpm.c:195 msgid "" " [--badreloc] [--notriggers] [--excludepath ]" msgstr "" -#: ../rpm.c:197 +#: ../rpm.c:196 msgid " [--ignoresize] file1.rpm ... fileN.rpm" msgstr "" -#: ../rpm.c:198 +#: ../rpm.c:197 msgid "" " rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]" msgstr "" -#: ../rpm.c:199 +#: ../rpm.c:198 msgid " [--oldpackage] [--root ] [--noscripts]" msgstr "" -#: ../rpm.c:200 +#: ../rpm.c:199 msgid "" " [--excludedocs] [--includedocs] [--rcfile ]" msgstr "" -#: ../rpm.c:201 +#: ../rpm.c:200 msgid "" " [--ignorearch] [--dbpath ] [--prefix ] " msgstr "" -#: ../rpm.c:202 +#: ../rpm.c:201 msgid " [--ftpproxy ] [--ftpport ]" msgstr "" -#: ../rpm.c:204 +#: ../rpm.c:203 msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]" msgstr "" -#: ../rpm.c:206 +#: ../rpm.c:205 msgid "" " [--badreloc] [--excludepath ] [--ignoresize]" msgstr "" -#: ../rpm.c:207 +#: ../rpm.c:206 msgid " file1.rpm ... fileN.rpm" msgstr "" -#: ../rpm.c:208 +#: ../rpm.c:207 msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]" msgstr "" -#: ../rpm.c:209 +#: ../rpm.c:208 msgid " [--scripts] [--root ] [--rcfile ]" msgstr "" -#: ../rpm.c:210 +#: ../rpm.c:209 msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" -#: ../rpm.c:211 +#: ../rpm.c:210 msgid "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" msgstr "" -#: ../rpm.c:213 +#: ../rpm.c:212 msgid "" " [--ftpport ] [--provides] [--triggers] [--dump]" msgstr "" -#: ../rpm.c:214 +#: ../rpm.c:213 msgid " [--changelog] [--dbpath ] [targets]" msgstr "" -#: ../rpm.c:215 +#: ../rpm.c:214 msgid " rpm {--verify -V -y} [-afpg] [--root ] [--rcfile ]" msgstr "" -#: ../rpm.c:216 +#: ../rpm.c:215 msgid "" " [--dbpath ] [--nodeps] [--nofiles] [--noscripts]" msgstr "" -#: ../rpm.c:217 +#: ../rpm.c:216 msgid " [--nomd5] [targets]" msgstr "" -#: ../rpm.c:218 +#: ../rpm.c:217 msgid " rpm {--setperms} [-afpg] [target]" msgstr "" -#: ../rpm.c:219 +#: ../rpm.c:218 msgid " rpm {--setugids} [-afpg] [target]" msgstr "" -#: ../rpm.c:220 +#: ../rpm.c:219 msgid " rpm {--erase -e} [--root ] [--noscripts] [--rcfile ]" msgstr "" -#: ../rpm.c:221 +#: ../rpm.c:220 msgid " [--dbpath ] [--nodeps] [--allmatches]" msgstr "" -#: ../rpm.c:222 +#: ../rpm.c:221 msgid "" " [--justdb] [--notriggers] rpackage1 ... packageN" msgstr "" -#: ../rpm.c:223 +#: ../rpm.c:222 msgid "" " rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile ]" msgstr "" -#: ../rpm.c:224 +#: ../rpm.c:223 msgid " [--sign] [--nobuild] [--timecheck ] ]" msgstr "" -#: ../rpm.c:225 +#: ../rpm.c:224 msgid " [--target=platform1[,platform2...]]" msgstr "" -#: ../rpm.c:226 +#: ../rpm.c:225 msgid " [--rmsource] specfile" msgstr "" -#: ../rpm.c:227 +#: ../rpm.c:226 msgid " rpm {--rmsource} [--rcfile ] [-v] specfile" msgstr "" -#: ../rpm.c:228 +#: ../rpm.c:227 msgid "" " rpm {--rebuild} [--rcfile ] [-v] source1.rpm ... sourceN.rpm" msgstr "" -#: ../rpm.c:229 +#: ../rpm.c:228 msgid "" " rpm {--recompile} [--rcfile ] [-v] source1.rpm ... sourceN.rpm" msgstr "" -#: ../rpm.c:230 +#: ../rpm.c:229 msgid " rpm {--resign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: ../rpm.c:231 +#: ../rpm.c:230 msgid " rpm {--addsign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: ../rpm.c:232 +#: ../rpm.c:231 msgid "" " rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile ]" msgstr "" -#: ../rpm.c:233 +#: ../rpm.c:232 msgid " package1 ... packageN" msgstr "" -#: ../rpm.c:234 +#: ../rpm.c:233 msgid " rpm {--rebuilddb} [--rcfile ] [--dbpath ]" msgstr "" -#: ../rpm.c:235 +#: ../rpm.c:234 msgid " rpm {--querytags}" msgstr "" -#: ../rpm.c:269 +#: ../rpm.c:268 msgid "usage:" msgstr "" -#: ../rpm.c:271 +#: ../rpm.c:270 msgid "print this message" msgstr "" -#: ../rpm.c:273 +#: ../rpm.c:272 msgid "print the version of rpm being used" msgstr "" -#: ../rpm.c:274 +#: ../rpm.c:273 msgid " all modes support the following arguments:" msgstr "" -#: ../rpm.c:275 +#: ../rpm.c:274 msgid " --rcfile " msgstr "" -#: ../rpm.c:276 +#: ../rpm.c:275 msgid "use instead of /etc/rpmrc and $HOME/.rpmrc" msgstr "" -#: ../rpm.c:278 +#: ../rpm.c:277 msgid "be a little more verbose" msgstr "" -#: ../rpm.c:280 +#: ../rpm.c:279 msgid "be incredibly verbose (for debugging)" msgstr "" -#: ../rpm.c:282 +#: ../rpm.c:281 msgid "query mode" msgstr "" -#: ../rpm.c:283 ../rpm.c:345 ../rpm.c:409 ../rpm.c:437 +#: ../rpm.c:282 ../rpm.c:344 ../rpm.c:408 ../rpm.c:436 msgid " --root " msgstr "" -#: ../rpm.c:284 ../rpm.c:346 ../rpm.c:410 ../rpm.c:438 ../rpm.c:500 +#: ../rpm.c:283 ../rpm.c:345 ../rpm.c:409 ../rpm.c:437 ../rpm.c:499 msgid "use as the top level directory" msgstr "" -#: ../rpm.c:285 ../rpm.c:343 ../rpm.c:373 ../rpm.c:425 ../rpm.c:497 +#: ../rpm.c:284 ../rpm.c:342 ../rpm.c:372 ../rpm.c:424 ../rpm.c:496 msgid " --dbpath " msgstr "" -#: ../rpm.c:286 ../rpm.c:344 ../rpm.c:374 ../rpm.c:426 ../rpm.c:498 +#: ../rpm.c:285 ../rpm.c:343 ../rpm.c:373 ../rpm.c:425 ../rpm.c:497 msgid "use as the directory for the database" msgstr "" -#: ../rpm.c:287 +#: ../rpm.c:286 msgid " --queryformat " msgstr "" -#: ../rpm.c:288 +#: ../rpm.c:287 msgid "use as the header format (implies -i)" msgstr "" -#: ../rpm.c:289 +#: ../rpm.c:288 msgid "" " install, upgrade and query (with -p) allow ftp URL's to be used in place" msgstr "" -#: ../rpm.c:290 +#: ../rpm.c:289 msgid " of file names as well as the following options:" msgstr "" -#: ../rpm.c:291 +#: ../rpm.c:290 msgid " --ftpproxy " msgstr "" -#: ../rpm.c:292 +#: ../rpm.c:291 msgid "hostname or IP of ftp proxy" msgstr "" -#: ../rpm.c:293 +#: ../rpm.c:292 msgid " --ftpport " msgstr "" -#: ../rpm.c:294 +#: ../rpm.c:293 msgid "port number of ftp server (or proxy)" msgstr "" -#: ../rpm.c:295 +#: ../rpm.c:294 msgid " --httpproxy " msgstr "" -#: ../rpm.c:296 +#: ../rpm.c:295 msgid "hostname or IP of http proxy" msgstr "" -#: ../rpm.c:297 +#: ../rpm.c:296 msgid " --httpport " msgstr "" -#: ../rpm.c:298 +#: ../rpm.c:297 msgid "port number of http server (or proxy)" msgstr "" -#: ../rpm.c:299 +#: ../rpm.c:298 msgid " Package specification options:" msgstr "" -#: ../rpm.c:301 +#: ../rpm.c:300 msgid "query all packages" msgstr "" -#: ../rpm.c:302 +#: ../rpm.c:301 msgid " -f + " msgstr "" -#: ../rpm.c:303 +#: ../rpm.c:302 msgid "query package owning " msgstr "" -#: ../rpm.c:304 +#: ../rpm.c:303 msgid " -p + " msgstr "" -#: ../rpm.c:305 +#: ../rpm.c:304 msgid "query (uninstalled) package " msgstr "" -#: ../rpm.c:306 +#: ../rpm.c:305 msgid " --triggeredby " msgstr "" -#: ../rpm.c:307 +#: ../rpm.c:306 msgid "query packages triggered by " msgstr "" -#: ../rpm.c:308 +#: ../rpm.c:307 msgid " --whatprovides " msgstr "" -#: ../rpm.c:309 +#: ../rpm.c:308 msgid "query packages which provide capability" msgstr "" -#: ../rpm.c:310 +#: ../rpm.c:309 msgid " --whatrequires " msgstr "" -#: ../rpm.c:311 +#: ../rpm.c:310 msgid "query packages which require capability" msgstr "" -#: ../rpm.c:312 +#: ../rpm.c:311 msgid " Information selection options:" msgstr "" -#: ../rpm.c:314 +#: ../rpm.c:313 msgid "display package information" msgstr "" -#: ../rpm.c:316 +#: ../rpm.c:315 msgid "display the package's change log" msgstr "" -#: ../rpm.c:318 +#: ../rpm.c:317 msgid "display package file list" msgstr "" -#: ../rpm.c:320 +#: ../rpm.c:319 msgid "show file states (implies -l)" msgstr "" -#: ../rpm.c:322 +#: ../rpm.c:321 msgid "list only documentation files (implies -l)" msgstr "" -#: ../rpm.c:324 +#: ../rpm.c:323 msgid "list only configuration files (implies -l)" msgstr "" -#: ../rpm.c:326 +#: ../rpm.c:325 msgid "" "show all verifiable information for each file (must be used with -l, -c, or " "-d)" msgstr "" -#: ../rpm.c:328 +#: ../rpm.c:327 msgid "list capabilities package provides" msgstr "" -#: ../rpm.c:329 +#: ../rpm.c:328 msgid " --requires" msgstr "" -#: ../rpm.c:331 +#: ../rpm.c:330 msgid "list package dependencies" msgstr "" -#: ../rpm.c:333 +#: ../rpm.c:332 msgid "print the various [un]install scripts" msgstr "" -#: ../rpm.c:335 +#: ../rpm.c:334 msgid "show the trigger scripts contained in the package" msgstr "" -#: ../rpm.c:339 +#: ../rpm.c:338 msgid " --pipe " msgstr "" -#: ../rpm.c:340 +#: ../rpm.c:339 msgid "send stdout to " msgstr "" -#: ../rpm.c:342 +#: ../rpm.c:341 msgid "" "verify a package installation using the same same package specification " "options as -q" msgstr "" -#: ../rpm.c:348 ../rpm.c:396 ../rpm.c:430 +#: ../rpm.c:347 ../rpm.c:395 ../rpm.c:429 msgid "do not verify package dependencies" msgstr "" -#: ../rpm.c:350 +#: ../rpm.c:349 msgid "do not verify file md5 checksums" msgstr "" -#: ../rpm.c:352 +#: ../rpm.c:351 msgid "do not verify file attributes" msgstr "" -#: ../rpm.c:355 +#: ../rpm.c:354 msgid "" "set the file permissions to those in the package database using the same " "package specification options as -q" msgstr "" -#: ../rpm.c:358 +#: ../rpm.c:357 msgid "" "set the file owner and group to those in the package database using the same " "package specification options as -q" msgstr "" -#: ../rpm.c:362 +#: ../rpm.c:361 msgid " --install " msgstr "" -#: ../rpm.c:363 +#: ../rpm.c:362 msgid " -i " msgstr "" -#: ../rpm.c:364 +#: ../rpm.c:363 msgid "install package" msgstr "" -#: ../rpm.c:365 +#: ../rpm.c:364 msgid " --excludepath " msgstr "" -#: ../rpm.c:366 +#: ../rpm.c:365 msgid "skip files in path " msgstr "" -#: ../rpm.c:367 +#: ../rpm.c:366 msgid " --relocate =" msgstr "" -#: ../rpm.c:368 +#: ../rpm.c:367 msgid "relocate files from to " msgstr "" -#: ../rpm.c:370 +#: ../rpm.c:369 msgid "relocate files even though the package doesn't allow it" msgstr "" -#: ../rpm.c:371 +#: ../rpm.c:370 msgid " --prefix " msgstr "" -#: ../rpm.c:372 +#: ../rpm.c:371 msgid "relocate the package to , if relocatable" msgstr "" -#: ../rpm.c:376 +#: ../rpm.c:375 msgid "do not install documentation" msgstr "" -#: ../rpm.c:378 +#: ../rpm.c:377 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: ../rpm.c:381 +#: ../rpm.c:380 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: ../rpm.c:383 +#: ../rpm.c:382 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: ../rpm.c:386 +#: ../rpm.c:385 msgid "don't verify package architecture" msgstr "" -#: ../rpm.c:388 +#: ../rpm.c:387 msgid "don't check disk space before installing" msgstr "" -#: ../rpm.c:390 +#: ../rpm.c:389 msgid "don't verify package operating system" msgstr "" -#: ../rpm.c:392 +#: ../rpm.c:391 msgid "install documentation" msgstr "" -#: ../rpm.c:394 ../rpm.c:428 +#: ../rpm.c:393 ../rpm.c:427 msgid "update the database, but do not modify the filesystem" msgstr "" -#: ../rpm.c:398 ../rpm.c:432 +#: ../rpm.c:397 ../rpm.c:431 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: ../rpm.c:400 +#: ../rpm.c:399 msgid "don't execute any installation scripts" msgstr "" -#: ../rpm.c:402 ../rpm.c:436 +#: ../rpm.c:401 ../rpm.c:435 msgid "don't execute any scripts triggered by this package" msgstr "" -#: ../rpm.c:404 +#: ../rpm.c:403 msgid "print percentages as package installs" msgstr "" -#: ../rpm.c:406 +#: ../rpm.c:405 msgid "install even if the package replaces installed files" msgstr "" -#: ../rpm.c:408 +#: ../rpm.c:407 msgid "reinstall if the package is already present" msgstr "" -#: ../rpm.c:412 +#: ../rpm.c:411 msgid "don't install, but tell if it would work or not" msgstr "" -#: ../rpm.c:414 +#: ../rpm.c:413 msgid " --upgrade " msgstr "" -#: ../rpm.c:415 +#: ../rpm.c:414 msgid " -U " msgstr "" -#: ../rpm.c:416 +#: ../rpm.c:415 msgid "upgrade package (same options as --install, plus)" msgstr "" -#: ../rpm.c:418 +#: ../rpm.c:417 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: ../rpm.c:420 +#: ../rpm.c:419 msgid " --erase " msgstr "" -#: ../rpm.c:422 +#: ../rpm.c:421 msgid "erase (uninstall) package" msgstr "" -#: ../rpm.c:424 +#: ../rpm.c:423 msgid "" "remove all packages which match (normally an error is generated if " " specified multiple packages)" msgstr "" -#: ../rpm.c:434 +#: ../rpm.c:433 msgid "do not execute any package specific scripts" msgstr "" -#: ../rpm.c:440 +#: ../rpm.c:439 msgid " -b " msgstr "" -#: ../rpm.c:441 +#: ../rpm.c:440 msgid " -t " msgstr "" -#: ../rpm.c:442 +#: ../rpm.c:441 msgid "build package, where is one of:" msgstr "" -#: ../rpm.c:444 +#: ../rpm.c:443 msgid "prep (unpack sources and apply patches)" msgstr "" -#: ../rpm.c:446 +#: ../rpm.c:445 #, c-format msgid "list check (do some cursory checks on %files)" msgstr "" -#: ../rpm.c:448 +#: ../rpm.c:447 msgid "compile (prep and compile)" msgstr "" -#: ../rpm.c:450 +#: ../rpm.c:449 msgid "install (prep, compile, install)" msgstr "" -#: ../rpm.c:452 +#: ../rpm.c:451 msgid "binary package (prep, compile, install, package)" msgstr "" -#: ../rpm.c:454 +#: ../rpm.c:453 msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: ../rpm.c:460 +#: ../rpm.c:459 msgid "remove sources and spec file when done" msgstr "" -#: ../rpm.c:462 +#: ../rpm.c:461 msgid "generate PGP/GPG signature" msgstr "" -#: ../rpm.c:463 +#: ../rpm.c:462 msgid " --buildroot " msgstr "" -#: ../rpm.c:464 +#: ../rpm.c:463 msgid "use as the build root" msgstr "" -#: ../rpm.c:465 +#: ../rpm.c:464 msgid " --target=+" msgstr "" -#: ../rpm.c:466 +#: ../rpm.c:465 msgid "build the packages for the build targets platform1...platformN." msgstr "" -#: ../rpm.c:468 +#: ../rpm.c:467 msgid "do not execute any stages" msgstr "" -#: ../rpm.c:469 +#: ../rpm.c:468 msgid " --timecheck " msgstr "" -#: ../rpm.c:470 +#: ../rpm.c:469 msgid "set the time check to seconds (0 disables)" msgstr "" -#: ../rpm.c:472 +#: ../rpm.c:471 msgid " --rebuild " msgstr "" -#: ../rpm.c:473 +#: ../rpm.c:472 msgid "" "install source package, build binary package and remove spec file, sources, " "patches, and icons." msgstr "" -#: ../rpm.c:474 +#: ../rpm.c:473 msgid " --rmsource " msgstr "" -#: ../rpm.c:475 +#: ../rpm.c:474 msgid "remove sources and spec file" msgstr "" -#: ../rpm.c:476 +#: ../rpm.c:475 msgid " --recompile " msgstr "" -#: ../rpm.c:477 +#: ../rpm.c:476 msgid "like --rebuild, but don't build any package" msgstr "" -#: ../rpm.c:478 +#: ../rpm.c:477 msgid " --resign + " msgstr "" -#: ../rpm.c:479 +#: ../rpm.c:478 msgid "sign a package (discard current signature)" msgstr "" -#: ../rpm.c:480 +#: ../rpm.c:479 msgid " --addsign + " msgstr "" -#: ../rpm.c:481 +#: ../rpm.c:480 msgid "add a signature to a package" msgstr "" -#: ../rpm.c:483 +#: ../rpm.c:482 msgid " --checksig + " msgstr "" -#: ../rpm.c:484 +#: ../rpm.c:483 msgid "verify package signature" msgstr "" -#: ../rpm.c:486 +#: ../rpm.c:485 msgid "skip any PGP signatures" msgstr "" -#: ../rpm.c:488 +#: ../rpm.c:487 msgid "skip any GPG signatures" msgstr "" -#: ../rpm.c:490 +#: ../rpm.c:489 msgid "skip any MD5 signatures" msgstr "" -#: ../rpm.c:492 +#: ../rpm.c:491 msgid "list the tags that can be used in a query format" msgstr "" -#: ../rpm.c:494 +#: ../rpm.c:493 msgid "make sure a valid database exists" msgstr "" -#: ../rpm.c:496 +#: ../rpm.c:495 msgid "rebuild database from existing database" msgstr "" -#: ../rpm.c:632 ../rpm.c:638 ../rpm.c:645 ../rpm.c:651 ../rpm.c:660 -#: ../rpm.c:667 ../rpm.c:714 ../rpm.c:720 ../rpm.c:780 ../rpm.c:788 -#: ../rpm.c:795 ../rpm.c:804 ../rpm.c:811 ../rpm.c:819 ../rpm.c:855 -#: ../rpm.c:910 ../rpm.c:917 +#: ../rpm.c:631 ../rpm.c:637 ../rpm.c:644 ../rpm.c:650 ../rpm.c:659 +#: ../rpm.c:666 ../rpm.c:713 ../rpm.c:719 ../rpm.c:779 ../rpm.c:787 +#: ../rpm.c:794 ../rpm.c:803 ../rpm.c:810 ../rpm.c:818 ../rpm.c:847 +#: ../rpm.c:902 ../rpm.c:909 msgid "only one major mode may be specified" msgstr "" -#: ../rpm.c:653 +#: ../rpm.c:652 msgid "-u and --uninstall are deprecated and no longer work.\n" msgstr "" -#: ../rpm.c:655 +#: ../rpm.c:654 msgid "Use -e or --erase instead.\n" msgstr "" -#: ../rpm.c:671 +#: ../rpm.c:670 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument" msgstr "" -#: ../rpm.c:675 +#: ../rpm.c:674 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument" msgstr "" -#: ../rpm.c:727 ../rpm.c:733 ../rpm.c:740 ../rpm.c:747 ../rpm.c:756 -#: ../rpm.c:764 ../rpm.c:772 ../rpm.c:924 +#: ../rpm.c:726 ../rpm.c:732 ../rpm.c:739 ../rpm.c:746 ../rpm.c:755 +#: ../rpm.c:763 ../rpm.c:771 ../rpm.c:916 msgid "one type of query/verify may be performed at a time" msgstr "" -#: ../rpm.c:827 +#: ../rpm.c:826 msgid "arguments to --dbpath must begin with a /" msgstr "" -#: ../rpm.c:861 +#: ../rpm.c:853 msgid "relocations must begin with a /" msgstr "" -#: ../rpm.c:863 +#: ../rpm.c:855 msgid "relocations must contain a =" msgstr "" -#: ../rpm.c:866 +#: ../rpm.c:858 msgid "relocations must have a / following the =" msgstr "" -#: ../rpm.c:875 +#: ../rpm.c:867 msgid "exclude paths must begin with a /" msgstr "" -#: ../rpm.c:884 +#: ../rpm.c:876 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: ../rpm.c:937 +#: ../rpm.c:929 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: ../rpm.c:942 +#: ../rpm.c:934 msgid "--timecheck may only be used during package builds" msgstr "" -#: ../rpm.c:945 ../rpm.c:948 +#: ../rpm.c:937 ../rpm.c:940 msgid "unexpected query specifiers" msgstr "" -#: ../rpm.c:952 +#: ../rpm.c:944 msgid "unexpected query source" msgstr "" -#: ../rpm.c:958 +#: ../rpm.c:950 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: ../rpm.c:961 +#: ../rpm.c:953 msgid "files may only be relocated during package installation" msgstr "" -#: ../rpm.c:964 +#: ../rpm.c:956 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: ../rpm.c:967 +#: ../rpm.c:959 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: ../rpm.c:970 +#: ../rpm.c:962 msgid "--prefix may only be used when installing new packages" msgstr "" -#: ../rpm.c:973 +#: ../rpm.c:965 msgid "arguments to --prefix must begin with a /" msgstr "" -#: ../rpm.c:976 +#: ../rpm.c:968 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: ../rpm.c:980 +#: ../rpm.c:972 msgid "--percent may only be specified during package installation" msgstr "" -#: ../rpm.c:984 +#: ../rpm.c:976 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: ../rpm.c:988 +#: ../rpm.c:980 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: ../rpm.c:992 +#: ../rpm.c:984 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: ../rpm.c:996 +#: ../rpm.c:988 msgid "--includedocs may only be specified during package installation" msgstr "" -#: ../rpm.c:1000 +#: ../rpm.c:992 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: ../rpm.c:1004 +#: ../rpm.c:996 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: ../rpm.c:1008 +#: ../rpm.c:1000 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: ../rpm.c:1012 +#: ../rpm.c:1004 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: ../rpm.c:1016 +#: ../rpm.c:1008 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: ../rpm.c:1020 +#: ../rpm.c:1012 msgid "--allfiles may only be specified during package installation" msgstr "" -#: ../rpm.c:1024 +#: ../rpm.c:1016 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: ../rpm.c:1029 +#: ../rpm.c:1021 msgid "" "--noscripts may only be specified during package installation, erasure, and " "verification" msgstr "" -#: ../rpm.c:1033 +#: ../rpm.c:1025 msgid "" "--notriggers may only be specified during package installation, erasure, and " "verification" msgstr "" -#: ../rpm.c:1039 +#: ../rpm.c:1031 msgid "" "--nodeps may only be specified during package building, installation, " "erasure, and verification" msgstr "" -#: ../rpm.c:1044 +#: ../rpm.c:1036 msgid "--nofiles may only be specified during package verification" msgstr "" -#: ../rpm.c:1050 +#: ../rpm.c:1042 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: ../rpm.c:1055 +#: ../rpm.c:1047 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: ../rpm.c:1060 +#: ../rpm.c:1052 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: ../rpm.c:1064 +#: ../rpm.c:1056 msgid "--clean may only be used with -b and -t" msgstr "" -#: ../rpm.c:1067 +#: ../rpm.c:1059 msgid "--rmsource may only be used with -b and -t" msgstr "" -#: ../rpm.c:1070 +#: ../rpm.c:1062 msgid "--short-circuit may only be used during package building" msgstr "" -#: ../rpm.c:1074 +#: ../rpm.c:1066 msgid "--short-circuit may only be used with -bc, -bi, -bs, -tc -ti, or -ts" msgstr "" -#: ../rpm.c:1080 +#: ../rpm.c:1072 msgid "--oldpackage may only be used during upgrades" msgstr "" -#: ../rpm.c:1085 +#: ../rpm.c:1077 msgid "" "ftp options can only be used during package queries, installs, and upgrades" msgstr "" -#: ../rpm.c:1091 +#: ../rpm.c:1083 msgid "" "http options can only be used during package queries, installs, and upgrades" msgstr "" -#: ../rpm.c:1095 +#: ../rpm.c:1087 msgid "--nopgp may only be used during signature checking" msgstr "" -#: ../rpm.c:1098 +#: ../rpm.c:1090 msgid "--nogpg may only be used during signature checking" msgstr "" -#: ../rpm.c:1101 +#: ../rpm.c:1093 msgid "" "--nomd5 may only be used during signature checking and package verification" msgstr "" -#: ../rpm.c:1127 +#: ../rpm.c:1119 #, c-format msgid "cannot access file %s\n" msgstr "" -#: ../rpm.c:1144 +#: ../rpm.c:1136 msgid "pgp not found: " msgstr "" -#: ../rpm.c:1147 +#: ../rpm.c:1139 msgid "Use `%%_signature pgp5' instead of `%%_signature pgp' in macro file.\n" msgstr "" -#: ../rpm.c:1154 +#: ../rpm.c:1146 msgid "pgp version 5 not found: " msgstr "" -#: ../rpm.c:1157 +#: ../rpm.c:1149 msgid "Use `%%_signature pgp' instead of `%%_signature pgp5' in macro file.\n" msgstr "" -#: ../rpm.c:1163 +#: ../rpm.c:1155 msgid "Enter pass phrase: " msgstr "" -#: ../rpm.c:1164 +#: ../rpm.c:1156 msgid "Pass phrase check failed\n" msgstr "" -#: ../rpm.c:1167 +#: ../rpm.c:1159 msgid "Pass phrase is good.\n" msgstr "" -#: ../rpm.c:1174 +#: ../rpm.c:1166 msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: ../rpm.c:1179 +#: ../rpm.c:1171 msgid "--sign may only be used during package building" msgstr "" -#: ../rpm.c:1196 +#: ../rpm.c:1188 msgid "exec failed\n" msgstr "" -#: ../rpm.c:1215 +#: ../rpm.c:1207 msgid "unexpected arguments to --querytags " msgstr "" -#: ../rpm.c:1226 +#: ../rpm.c:1218 msgid "no packages given for signature check" msgstr "" -#: ../rpm.c:1238 +#: ../rpm.c:1230 msgid "no packages given for signing" msgstr "" -#: ../rpm.c:1251 +#: ../rpm.c:1243 msgid "no packages files given for rebuild" msgstr "" -#: ../rpm.c:1308 +#: ../rpm.c:1300 msgid "no spec files given for build" msgstr "" -#: ../rpm.c:1310 +#: ../rpm.c:1302 msgid "no tar files given for build" msgstr "" -#: ../rpm.c:1322 +#: ../rpm.c:1314 msgid "no packages given for uninstall" msgstr "" -#: ../rpm.c:1371 +#: ../rpm.c:1363 msgid "no packages given for install" msgstr "" -#: ../rpm.c:1394 +#: ../rpm.c:1386 msgid "extra arguments given for query of all packages" msgstr "" -#: ../rpm.c:1399 +#: ../rpm.c:1391 msgid "no arguments given for query" msgstr "" -#: ../rpm.c:1420 +#: ../rpm.c:1412 msgid "extra arguments given for verify of all packages" msgstr "" -#: ../rpm.c:1424 +#: ../rpm.c:1416 msgid "no arguments given for verify" msgstr "" @@ -2289,31 +2289,31 @@ msgstr "" msgid "error removing record %s into %s" msgstr "" -#: ../lib/depends.c:429 ../lib/depends.c:588 +#: ../lib/depends.c:456 ../lib/depends.c:615 #, c-format msgid "cannot read header at %d for dependency check" msgstr "" -#: ../lib/depends.c:494 +#: ../lib/depends.c:521 #, c-format msgid "dependencies: looking for %s\n" msgstr "" -#: ../lib/depends.c:682 +#: ../lib/depends.c:709 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" -#: ../lib/depends.c:725 +#: ../lib/depends.c:752 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: ../lib/depends.c:825 +#: ../lib/depends.c:852 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: ../lib/depends.c:877 +#: ../lib/depends.c:904 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" diff --git a/rpm.spec b/rpm.spec index 5434ff0..f7c9ae2 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,8 +1,8 @@ Summary: The Red Hat package management system. Name: rpm -%define version 3.0.1 +%define version 3.0.2 Version: %{version} -Release: 12 +Release: 0.1 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Copyright: GPL diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 5b74966..f30e177 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -109,6 +109,7 @@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ NM = @NM@ +OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ PGPBIN = @PGPBIN@ POFILES = @POFILES@ @@ -124,7 +125,6 @@ SYSCONFIGDIR = @SYSCONFIGDIR@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ -USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@ VERSION = @VERSION@ __CAT = @__CAT@ __CHGRP = @__CHGRP@ -- 2.7.4