RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2000@rpm5.org
Module: max-rpm Date: 21-Sep-2010 18:46:10
Branch: HEAD Handle: 2010092116460900
Modified files:
max-rpm ChangeLog aclocal.m4 rpm-manpage.sgml
rpmbuild-manpage.sgml rpmdeps-manpage.sgml
Log:
Merge Fix Dash escaping in man pages
Merge fix lp:637060
Merge fix @rpm.org ticket #66
Summary:
Revision Changes Path
1.3 +7 -0 max-rpm/ChangeLog
1.8 +154 -94 max-rpm/aclocal.m4
1.22 +263 -263 max-rpm/rpm-manpage.sgml
1.10 +33 -33 max-rpm/rpmbuild-manpage.sgml
1.4 +2 -2 max-rpm/rpmdeps-manpage.sgml
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: max-rpm/ChangeLog
============================================================================
$ cvs diff -u -r1.2 -r1.3 ChangeLog
--- max-rpm/ChangeLog 12 Jun 2005 18:36:10 -0000 1.2
+++ max-rpm/ChangeLog 21 Sep 2010 16:46:09 -0000 1.3
@@ -1,3 +1,10 @@
+2009-02-11 devzero2000 <devzero2000@rpm5.org>
+
+ * rpm-manpage.sgml:
+ Merge Fix Dash escaping in man pages
+ Merge fix lp:637060, @rpm.org ticket #66
+
+
2005-06-12 jbj <jbj@wellfleet.jbj.org>
* aclocal.m4: egenerate with FC4 aclocal.
@@ .
patch -p0 <<'@@ .'
Index: max-rpm/aclocal.m4
============================================================================
$ cvs diff -u -r1.7 -r1.8 aclocal.m4
--- max-rpm/aclocal.m4 12 Jun 2005 17:42:53 -0000 1.7
+++ max-rpm/aclocal.m4 21 Sep 2010 16:46:09 -0000 1.8
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -21,14 +29,31 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.5])])
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -85,14 +110,14 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 16
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -109,16 +134,20 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.62])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
@@ -138,6 +167,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -153,8 +185,8 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -162,20 +194,37 @@
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
@@ -186,18 +235,19 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -208,7 +258,14 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -234,14 +291,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 6
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -257,7 +314,15 @@
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -267,7 +332,7 @@
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -275,70 +340,33 @@
# AM_PROG_MKDIR_P
# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -355,7 +383,7 @@
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
@@ -365,14 +393,14 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_SANITY_CHECK
# ---------------
@@ -381,16 +409,29 @@
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -440,9 +481,28 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
@@ .
patch -p0 <<'@@ .'
Index: max-rpm/rpm-manpage.sgml
============================================================================
$ cvs diff -u -r1.21 -r1.22 rpm-manpage.sgml
--- max-rpm/rpm-manpage.sgml 11 Feb 2009 11:19:57 -0000 1.21
+++ max-rpm/rpm-manpage.sgml 21 Sep 2010 16:46:09 -0000 1.22
@@ -18,7 +18,7 @@
<member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-q|--query</option></arg>
+ <arg choice="req"><option>-q|-\-query</option></arg>
<arg><synopfragmentref linkend="select-options">
select-options
</synopfragmentref></arg>
@@ -29,7 +29,7 @@
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-V|--verify</option></arg>
+ <arg choice="req"><option>-V|-\-verify</option></arg>
<arg><synopfragmentref linkend="select-options">
select-options
</synopfragmentref></arg>
@@ -40,16 +40,16 @@
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>--import</option></arg>
+ <arg choice="req"><option>-\-import</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PUBKEY</replaceable></arg>
</cmdsynopsis>
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-K|--checksig</option></arg>
- <arg><option>--nogpg</option></arg>
- <arg><option>--nopgp</option></arg>
- <arg><option>--nomd5</option></arg>
+ <arg choice="req"><option>-K|-\-checksig</option></arg>
+ <arg><option>-\-nogpg</option></arg>
+ <arg><option>-\-nopgp</option></arg>
+ <arg><option>-\-nomd5</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PACKAGE_FILE</replaceable></arg>
</cmdsynopsis>
</member>
@@ -62,7 +62,7 @@
<member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-i|--install</option></arg>
+ <arg choice="req"><option>-i|-\-install</option></arg>
<arg><synopfragmentref linkend="install-options">
install-options
</synopfragmentref></arg>
@@ -71,7 +71,7 @@
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-U|--upgrade</option></arg>
+ <arg choice="req"><option>-U|-\-upgrade</option></arg>
<arg><synopfragmentref linkend="install-options">
install-options
</synopfragmentref></arg>
@@ -80,7 +80,7 @@
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-F|--freshen</option></arg>
+ <arg choice="req"><option>-F|-\-freshen</option></arg>
<arg><synopfragmentref linkend="install-options">
install-options
</synopfragmentref></arg>
@@ -89,14 +89,14 @@
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-e|--erase</option></arg>
- <arg><option>--allmatches</option></arg>
- <arg><option>--nodeps</option></arg>
- <arg><option>--noscripts</option></arg>
- <arg><option>--notriggers</option></arg>
+ <arg choice="req"><option>-e|-\-erase</option></arg>
+ <arg><option>-\-allmatches</option></arg>
+ <arg><option>-\-nodeps</option></arg>
+ <arg><option>-\-noscripts</option></arg>
+ <arg><option>-\-notriggers</option></arg>
<sbr/>
- <arg><option>--repackage</option></arg>
- <arg><option>--test</option></arg>
+ <arg><option>-\-repackage</option></arg>
+ <arg><option>-\-test</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PACKAGE_NAME</replaceable></arg>
</cmdsynopsis>
</member>
@@ -109,23 +109,23 @@
<member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>--initdb|--rebuilddb</option></arg>
+ <arg choice="req"><option>-\-initdb|-\-rebuilddb</option></arg>
</cmdsynopsis>
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>--addsign|--resign</option></arg>
+ <arg choice="req"><option>-\-addsign|-\-resign</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PACKAGE_FILE</replaceable></arg>
</cmdsynopsis>
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>--querytags|--showrc</option></arg>
+ <arg choice="req"><option>-\-querytags|-\-showrc</option></arg>
</cmdsynopsis>
</member><member>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>--setperms|--setugids</option></arg>
+ <arg choice="req"><option>-\-setperms|-\-setugids</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PACKAGE_NAME</replaceable></arg>
</cmdsynopsis>
</member>
@@ -139,30 +139,30 @@
<cmdsynopsis>
<command></command>
-<!-- ================================ -->
+<!-\- ================================ -\->
<synopfragment id="select-options">
<group choice="plain">
<arg><option><replaceable>PACKAGE_NAME</replaceable></option></arg>
- <arg><option>-a,--all</option></arg>
+ <arg><option>-a,-\-all</option></arg>
<sbr/>
- <arg><option>-f,--file</option> <replaceable>FILE</replaceable></arg>
- <arg><option>-g,--group</option> <replaceable>GROUP</replaceable></arg>
- <arg><option>-p,--package</option> <replaceable>PACKAGE_FILE</replaceable></arg>
+ <arg><option>-f,-\-file</option> <replaceable>FILE</replaceable></arg>
+ <arg><option>-g,-\-group</option> <replaceable>GROUP</replaceable></arg>
+ <arg><option>-p,-\-package</option> <replaceable>PACKAGE_FILE</replaceable></arg>
<sbr/>
- <arg><option>--fileid</option> <replaceable>MD5</replaceable></arg>
- <arg><option>--hdrid</option> <replaceable>SHA1</replaceable></arg>
- <arg><option>--pkgid</option> <replaceable>MD5</replaceable></arg>
+ <arg><option>-\-fileid</option> <replaceable>MD5</replaceable></arg>
+ <arg><option>-\-hdrid</option> <replaceable>SHA1</replaceable></arg>
+ <arg><option>-\-pkgid</option> <replaceable>MD5</replaceable></arg>
<sbr/>
- <arg><option>--querybynumber</option> <replaceable>HDRNUM</replaceable></arg>
- <arg><option>--tid</option> <replaceable>TID</replaceable></arg>
- <arg><option>--triggeredby</option> <replaceable>PACKAGE_NAME</replaceable></arg>
+ <arg><option>-\-querybynumber</option> <replaceable>HDRNUM</replaceable></arg>
+ <arg><option>-\-tid</option> <replaceable>TID</replaceable></arg>
+ <arg><option>-\-triggeredby</option> <replaceable>PACKAGE_NAME</replaceable></arg>
<sbr/>
- <arg><option>--whatprovides</option> <replaceable>CAPABILITY</replaceable></arg>
- <arg><option>--whatrequires</option> <replaceable>CAPABILITY</replaceable></arg>
+ <arg><option>-\-whatprovides</option> <replaceable>CAPABILITY</replaceable></arg>
+ <arg><option>-\-whatrequires</option> <replaceable>CAPABILITY</replaceable></arg>
</group>
</synopfragment>
-<!-- ================================ -->
+<!-\- ================================ -\->
</cmdsynopsis>
</member>
@@ -176,28 +176,28 @@
<cmdsynopsis>
<command></command>
-<!-- ================================ -->
+<!-\- ================================ -\->
<synopfragment id="query-options">
<group choice="plain">
- <arg><option>--changelog</option></arg>
- <arg><option>-c,--configfiles</option></arg>
- <arg><option>-d,--docfiles</option></arg>
- <arg><option>--dump</option></arg>
- <arg><option>--filesbypkg</option></arg>
+ <arg><option>-\-changelog</option></arg>
+ <arg><option>-c,-\-configfiles</option></arg>
+ <arg><option>-d,-\-docfiles</option></arg>
+ <arg><option>-\-dump</option></arg>
+ <arg><option>-\-filesbypkg</option></arg>
<sbr/>
- <arg><option>-i,--info</option></arg>
- <arg><option>--last</option></arg>
- <arg><option>-l,--list</option></arg>
- <arg><option>--provides</option></arg>
- <arg><option>--qf,--queryformat</option> <replaceable>QUERYFMT</replaceable></arg>
- <arg><option>-R,--requires</option></arg>
+ <arg><option>-i,-\-info</option></arg>
+ <arg><option>-\-last</option></arg>
+ <arg><option>-l,-\-list</option></arg>
+ <arg><option>-\-provides</option></arg>
+ <arg><option>-\-qf,-\-queryformat</option> <replaceable>QUERYFMT</replaceable></arg>
+ <arg><option>-R,-\-requires</option></arg>
<sbr/>
- <arg><option>--scripts</option></arg>
- <arg><option>-s,--state</option></arg>
- <arg><option>--triggers,--triggerscripts</option></arg>
+ <arg><option>-\-scripts</option></arg>
+ <arg><option>-s,-\-state</option></arg>
+ <arg><option>-\-triggers,-\-triggerscripts</option></arg>
</group>
</synopfragment>
-<!-- ================================ -->
+<!-\- ================================ -\->
</cmdsynopsis>
</member>
@@ -211,28 +211,28 @@
<cmdsynopsis>
<command></command>
-<!-- ================================ -->
+<!-\- ================================ -\->
<synopfragment id="verify-options">
<group choice="plain">
- <arg><option>--nodeps</option></arg>
- <arg><option>--nofiles</option></arg>
- <arg><option>--noscripts</option></arg>
+ <arg><option>-\-nodeps</option></arg>
+ <arg><option>-\-nofiles</option></arg>
+ <arg><option>-\-noscripts</option></arg>
<sbr/>
- <arg><option>--nodigest</option></arg>
- <arg><option>--nosignature</option></arg>
+ <arg><option>-\-nodigest</option></arg>
+ <arg><option>-\-nosignature</option></arg>
<sbr/>
- <arg><option>--nolinkto</option></arg>
- <arg><option>--nomd5</option></arg>
- <arg><option>--nosize</option></arg>
- <arg><option>--nouser</option></arg>
+ <arg><option>-\-nolinkto</option></arg>
+ <arg><option>-\-nomd5</option></arg>
+ <arg><option>-\-nosize</option></arg>
+ <arg><option>-\-nouser</option></arg>
<sbr/>
- <arg><option>--nogroup</option></arg>
- <arg><option>--nomtime</option></arg>
- <arg><option>--nomode</option></arg>
- <arg><option>--nordev</option></arg>
+ <arg><option>-\-nogroup</option></arg>
+ <arg><option>-\-nomtime</option></arg>
+ <arg><option>-\-nomode</option></arg>
+ <arg><option>-\-nordev</option></arg>
</group>
</synopfragment>
-<!-- ================================ -->
+<!-\- ================================ -\->
</cmdsynopsis>
</member>
@@ -246,44 +246,44 @@
<cmdsynopsis>
<command></command>
-<!-- ================================ -->
+<!-\- ================================ -\->
<synopfragment id="install-options">
<group choice="plain">
- <arg><option>--aid</option></arg>
- <arg><option>--allfiles</option></arg>
- <arg><option>--badreloc</option></arg>
- <arg><option>--excludepath</option> <replaceable>OLDPATH</replaceable></arg>
- <arg><option>--excludedocs</option></arg>
- <arg><option>--force</option></arg>
- <arg><option>-h,--hash</option></arg>
+ <arg><option>-\-aid</option></arg>
+ <arg><option>-\-allfiles</option></arg>
+ <arg><option>-\-badreloc</option></arg>
+ <arg><option>-\-excludepath</option> <replaceable>OLDPATH</replaceable></arg>
+ <arg><option>-\-excludedocs</option></arg>
+ <arg><option>-\-force</option></arg>
+ <arg><option>-h,-\-hash</option></arg>
<sbr/>
- <arg><option>--ignoresize</option></arg>
- <arg><option>--ignorearch</option></arg>
- <arg><option>--ignoreos</option></arg>
- <arg><option>--includedocs</option></arg>
- <arg><option>--justdb</option></arg>
+ <arg><option>-\-ignoresize</option></arg>
+ <arg><option>-\-ignorearch</option></arg>
+ <arg><option>-\-ignoreos</option></arg>
+ <arg><option>-\-includedocs</option></arg>
+ <arg><option>-\-justdb</option></arg>
<sbr/>
- <arg><option>--nodigest</option></arg>
- <arg><option>--nosignature</option></arg>
- <arg><option>--nodeps</option></arg>
- <arg><option>--nosuggest</option></arg>
- <arg><option>--noorder</option></arg>
+ <arg><option>-\-nodigest</option></arg>
+ <arg><option>-\-nosignature</option></arg>
+ <arg><option>-\-nodeps</option></arg>
+ <arg><option>-\-nosuggest</option></arg>
+ <arg><option>-\-noorder</option></arg>
<sbr/>
- <arg><option>--noscripts</option></arg>
- <arg><option>--notriggers</option></arg>
+ <arg><option>-\-noscripts</option></arg>
+ <arg><option>-\-notriggers</option></arg>
<sbr/>
- <arg><option>--oldpackage</option></arg>
- <arg><option>--percent</option></arg>
- <arg><option>--prefix</option> <replaceable>NEWPATH</replaceable></arg>
- <arg><option>--relocate</option> <replaceable>OLDPATH</replaceable>=<replaceable>NEWPATH</replaceable></arg>
+ <arg><option>-\-oldpackage</option></arg>
+ <arg><option>-\-percent</option></arg>
+ <arg><option>-\-prefix</option> <replaceable>NEWPATH</replaceable></arg>
+ <arg><option>-\-relocate</option> <replaceable>OLDPATH</replaceable>=<replaceable>NEWPATH</replaceable></arg>
<sbr/>
- <arg><option>--repackage</option></arg>
- <arg><option>--replacefiles</option></arg>
- <arg><option>--replacepkgs</option></arg>
- <arg><option>--test</option></arg>
+ <arg><option>-\-repackage</option></arg>
+ <arg><option>-\-replacefiles</option></arg>
+ <arg><option>-\-replacepkgs</option></arg>
+ <arg><option>-\-test</option></arg>
</group>
</synopfragment>
-<!-- ================================ -->
+<!-\- ================================ -\->
</cmdsynopsis>
</member>
@@ -330,17 +330,17 @@
</para>
<variablelist>
<varlistentry>
- <term><option>-?, --help</option></term>
+ <term><option>-?, -\-help</option></term>
<listitem><para>
Print a longer usage message then normal.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--version</option></term>
+ <term><option>-\-version</option></term>
<listitem><para>
Print a single line containing the version number of &rpm;
being used. </para></listitem>
</varlistentry><varlistentry>
- <term><option>--quiet</option></term>
+ <term><option>-\-quiet</option></term>
<listitem><para>
Print as little as possible - normally only error messages will
be displayed.
@@ -357,7 +357,7 @@
Print lots of ugly debugging information.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--rcfile</option> <replaceable>FILELIST</replaceable></term>
+ <term><option>-\-rcfile</option> <replaceable>FILELIST</replaceable></term>
<listitem><para>
Each of the files in the colon separated
<replaceable>FILELIST</replaceable>
@@ -369,18 +369,18 @@
<filename>/usr/lib/rpm/rpmrc</filename>:<filename>/usr/lib/rpm/redhat/rpmrc</filename>:<filename>/etc/rpmrc</filename>:<filename>~/.rpmrc</filename>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--pipe</option> <replaceable>CMD</replaceable></term>
+ <term><option>-\-pipe</option> <replaceable>CMD</replaceable></term>
<listitem><para>
Pipes the output of &rpm; to the command <replaceable>CMD</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--dbpath</option> <replaceable>DIRECTORY</replaceable></term>
+ <term><option>-\-dbpath</option> <replaceable>DIRECTORY</replaceable></term>
<listitem><para>
Use the database in <replaceable>DIRECTORY</replaceable> rather
than the default path <filename>/var/lib/rpm</filename>
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--root</option> <replaceable>DIRECTORY</replaceable></term>
+ <term><option>-\-root</option> <replaceable>DIRECTORY</replaceable></term>
<listitem><para>
Use the file system tree rooted at <replaceable>DIRECTORY</replaceable> for all operations.
Note that this means the database within
@@ -403,7 +403,7 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-i|--install</option></arg>
+ <arg choice="req"><option>-i|-\-install</option></arg>
<arg><synopfragmentref linkend="install-options">
install-options
</synopfragmentref></arg>
@@ -421,7 +421,7 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-U|--upgrade</option></arg>
+ <arg choice="req"><option>-U|-\-upgrade</option></arg>
<arg><synopfragmentref linkend="install-options">
install-options
</synopfragmentref></arg>
@@ -439,7 +439,7 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-F|--freshen</option></arg>
+ <arg choice="req"><option>-F|-\-freshen</option></arg>
<arg><synopfragmentref linkend="install-options">
install-options
</synopfragmentref></arg>
@@ -464,118 +464,118 @@
<para>
<variablelist>
<varlistentry>
- <term><option>--aid</option></term>
+ <term><option>-\-aid</option></term>
<listitem><para>
Add suggested packages to the transaction set when needed.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--allfiles</option></term>
+ <term><option>-\-allfiles</option></term>
<listitem><para>
Installs or upgrades all the missingok files in the package,
regardless if they exist.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--badreloc</option></term>
+ <term><option>-\-badreloc</option></term>
<listitem><para>
- Used with <option>--relocate</option>, permit relocations on
+ Used with <option>-\-relocate</option>, permit relocations on
all file paths, not just those <replaceable>OLDPATH</replaceable>'s
included in the binary package relocation hint(s).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--excludepath</option> <replaceable>OLDPATH</replaceable></term>
+ <term><option>-\-excludepath</option> <replaceable>OLDPATH</replaceable></term>
<listitem><para>
Don't install files whose name begins with
<replaceable>OLDPATH</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--excludedocs</option></term>
+ <term><option>-\-excludedocs</option></term>
<listitem><para>
Don't install any files which are marked as documentation
(which includes man pages and texinfo documents).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--force</option></term>
+ <term><option>-\-force</option></term>
<listitem><para>
Same as using
- <option>--replacepkgs</option>,
- <option>--replacefiles</option>, and
- <option>--oldpackage</option>.
+ <option>-\-replacepkgs</option>,
+ <option>-\-replacefiles</option>, and
+ <option>-\-oldpackage</option>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-h, --hash</option></term>
+ <term><option>-h, -\-hash</option></term>
<listitem><para>
Print 50 hash marks as the package archive is unpacked.
- Use with <option>-v|--verbose</option> for a nicer display.
+ Use with <option>-v|-\-verbose</option> for a nicer display.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--ignoresize</option></term>
+ <term><option>-\-ignoresize</option></term>
<listitem><para>
Don't check mount file systems for sufficient disk space before
installing this package.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--ignorearch</option></term>
+ <term><option>-\-ignorearch</option></term>
<listitem><para>
Allow installation or upgrading even if the architectures
of the binary package and host don't match.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--ignoreos</option></term>
+ <term><option>-\-ignoreos</option></term>
<listitem><para>
Allow installation or upgrading even if the operating
systems of the binary package and host don't match.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--includedocs</option></term>
+ <term><option>-\-includedocs</option></term>
<listitem><para>
Install documentation files. This is the default behavior.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--justdb</option></term>
+ <term><option>-\-justdb</option></term>
<listitem><para>
Update only the database, not the filesystem.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nodigest</option></term>
+ <term><option>-\-nodigest</option></term>
<listitem><para>
Don't verify package or header digests when reading.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nosignature</option></term>
+ <term><option>-\-nosignature</option></term>
<listitem><para>
Don't verify package or header signatures when reading.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nodeps</option></term>
+ <term><option>-\-nodeps</option></term>
<listitem><para>
Don't do a dependency check before installing or upgrading
a package.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nosuggest</option></term>
+ <term><option>-\-nosuggest</option></term>
<listitem><para>
Don't suggest package(s) that provide a missing dependency.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--noorder</option></term>
+ <term><option>-\-noorder</option></term>
<listitem><para>
Don't reorder the packages for an install. The list of
packages would normally be reordered to satisfy dependencies.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--noscripts</option></term>
- <term><option>--nopre</option></term>
- <term><option>--nopost</option></term>
- <term><option>--nopreun</option></term>
- <term><option>--nopostun</option></term>
+ <term><option>-\-noscripts</option></term>
+ <term><option>-\-nopre</option></term>
+ <term><option>-\-nopost</option></term>
+ <term><option>-\-nopreun</option></term>
+ <term><option>-\-nopostun</option></term>
<listitem><para>
Don't execute the scriptlet of the same name.
- The <option>--noscripts</option> option is equivalent to
+ The <option>-\-noscripts</option> option is equivalent to
</para><para>
- <option>--nopre</option>
- <option>--nopost</option>
- <option>--nopreun</option>
- <option>--nopostun</option>
+ <option>-\-nopre</option>
+ <option>-\-nopost</option>
+ <option>-\-nopreun</option>
+ <option>-\-nopostun</option>
</para><para>
and turns off the execution of the corresponding
<command>%pre</command>,
@@ -585,17 +585,17 @@
scriptlet(s).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--notriggers</option></term>
- <term><option>--notriggerin</option></term>
- <term><option>--notriggerun</option></term>
- <term><option>--notriggerpostun</option></term>
+ <term><option>-\-notriggers</option></term>
+ <term><option>-\-notriggerin</option></term>
+ <term><option>-\-notriggerun</option></term>
+ <term><option>-\-notriggerpostun</option></term>
<listitem><para>
Don't execute any trigger scriptlet of the named type.
- The <option>--notriggers</option> option is equivalent to
+ The <option>-\-notriggers</option> option is equivalent to
</para><para>
- <option>--notriggerin</option>
- <option>--notriggerun</option>
- <option>--notriggerpostun</option>
+ <option>-\-notriggerin</option>
+ <option>-\-notriggerun</option>
+ <option>-\-notriggerpostun</option>
</para><para>
and turns off execution of the corresponding
<command>%triggerin</command>,
@@ -604,26 +604,26 @@
scriptlet(s).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--oldpackage</option></term>
+ <term><option>-\-oldpackage</option></term>
<listitem><para>
Allow an upgrade to replace a newer package with an older one.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--percent</option></term>
+ <term><option>-\-percent</option></term>
<listitem><para>
Print percentages as files are unpacked from the package archive.
This is intended to make &rpm; easy to run from
other tools.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--prefix</option> <replaceable>NEWPATH</replaceable></term>
+ <term><option>-\-prefix</option> <replaceable>NEWPATH</replaceable></term>
<listitem><para>
For relocateable binary packages, translate all file paths that
start with the installation prefix in the package relocation hint(s)
to <replaceable>NEWPATH</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--relocate</option> <replaceable>OLDPATH</replaceable>=<replaceable>NEWPATH</replaceable></term>
+ <term><option>-\-relocate</option> <replaceable>OLDPATH</replaceable>=<replaceable>NEWPATH</replaceable></term>
<listitem><para>
For relocatable binary packages, translate all file paths
that start with <replaceable>OLDPATH</replaceable> in the
@@ -633,7 +633,7 @@
be relocated.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--repackage</option></term>
+ <term><option>-\-repackage</option></term>
<listitem><para>
Re-package the files before erasing. The previously installed
package will be named according to the macro
@@ -643,19 +643,19 @@
is <filename>/var/spool/repackage</filename>).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--replacefiles</option></term>
+ <term><option>-\-replacefiles</option></term>
<listitem><para>
Install the packages even if they replace files from other,
already installed, packages.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--replacepkgs</option></term>
+ <term><option>-\-replacepkgs</option></term>
<listitem><para>
Install the packages even if some of them are already installed
on this system.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--test</option></term>
+ <term><option>-\-test</option></term>
<listitem><para>
Do not install the package, simply check for and report
potential conflicts.
@@ -673,13 +673,13 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-e|--erase</option></arg>
- <arg><option>--allmatches</option></arg>
- <arg><option>--nodeps</option></arg>
- <arg><option>--noscripts</option></arg>
- <arg><option>--notriggers</option></arg>
- <arg><option>--repackage</option></arg>
- <arg><option>--test</option></arg>
+ <arg choice="req"><option>-e|-\-erase</option></arg>
+ <arg><option>-\-allmatches</option></arg>
+ <arg><option>-\-nodeps</option></arg>
+ <arg><option>-\-noscripts</option></arg>
+ <arg><option>-\-notriggers</option></arg>
+ <arg><option>-\-repackage</option></arg>
+ <arg><option>-\-test</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PACKAGE_NAME</replaceable></arg>
</cmdsynopsis>
</para>
@@ -689,7 +689,7 @@
</para>
<variablelist>
<varlistentry>
- <term><option>--allmatches</option></term>
+ <term><option>-\-allmatches</option></term>
<listitem><para>
Remove all versions of the package which match
<replaceable>PACKAGE_NAME</replaceable>. Normally an
@@ -697,21 +697,21 @@
matches multiple packages.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nodeps</option></term>
+ <term><option>-\-nodeps</option></term>
<listitem><para>
Don't check dependencies before uninstalling the packages.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--noscripts</option></term>
- <term><option>--nopreun</option></term>
- <term><option>--nopostun</option></term>
+ <term><option>-\-noscripts</option></term>
+ <term><option>-\-nopreun</option></term>
+ <term><option>-\-nopostun</option></term>
<listitem><para>
Don't execute the scriptlet of the same name.
- The <option>--noscripts</option> option during package erase is
+ The <option>-\-noscripts</option> option during package erase is
equivalent to
</para><para>
- <option>--nopreun</option>
- <option>--nopostun</option>
+ <option>-\-nopreun</option>
+ <option>-\-nopostun</option>
</para><para>
and turns off the execution of the corresponding
<command>%preun</command>, and
@@ -719,15 +719,15 @@
scriptlet(s).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--notriggers</option></term>
- <term><option>--notriggerun</option></term>
- <term><option>--notriggerpostun</option></term>
+ <term><option>-\-notriggers</option></term>
+ <term><option>-\-notriggerun</option></term>
+ <term><option>-\-notriggerpostun</option></term>
<listitem><para>
Don't execute any trigger scriptlet of the named type.
- The <option>--notriggers</option> option is equivalent to
+ The <option>-\-notriggers</option> option is equivalent to
</para><para>
- <option>--notriggerun</option>
- <option>--notriggerpostun</option>
+ <option>-\-notriggerun</option>
+ <option>-\-notriggerpostun</option>
</para><para>
and turns off execution of the corresponding
<command>%triggerun</command>, and
@@ -735,7 +735,7 @@
scriptlet(s).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--repackage</option></term>
+ <term><option>-\-repackage</option></term>
<listitem><para>
Re-package the files before erasing. The previously installed
package will be named according to the macro
@@ -745,7 +745,7 @@
is <filename>/var/spool/repackage</filename>).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--test</option></term>
+ <term><option>-\-test</option></term>
<listitem><para>
Don't really uninstall anything, just go through the motions.
Useful in conjunction with the <option>-vv</option> option
@@ -763,7 +763,7 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-q|--query</option></arg>
+ <arg choice="req"><option>-q|-\-query</option></arg>
<arg><synopfragmentref linkend="select-options">
select-options
</synopfragmentref></arg>
@@ -777,7 +777,7 @@
You may specify the format that package information should be
printed in. To do this, you use the
<cmdsynopsis>
- <arg choice="req"><option>--qf|--queryformat</option></arg>
+ <arg choice="req"><option>-\-qf|-\-queryformat</option></arg>
<arg choice="plain"><replaceable>QUERYFMT</replaceable></arg>
</cmdsynopsis>
option, followed by the <replaceable>QUERYFMT</replaceable>
@@ -861,7 +861,7 @@
To print the packages name and distribution information in
two columns, you could use <command>%-30{NAME}%{DISTRIBUTION}</command>.
&rpm; will print a list of all of the tags it knows about when it
- is invoked with the <option>--querytags</option> argument.
+ is invoked with the <option>-\-querytags</option> argument.
</para><para>
There are two subsets of options for querying: package selection,
and information selection.
@@ -878,34 +878,34 @@
Query installed package named <replaceable>PACKAGE_NAME</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-a, --all</option></term>
+ <term><option>-a, -\-all</option></term>
<listitem><para>
Query all installed packages.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-f, --file</option> <replaceable>FILE</replaceable></term>
+ <term><option>-f, -\-file</option> <replaceable>FILE</replaceable></term>
<listitem><para>
Query package owning <replaceable>FILE</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--fileid</option> <replaceable>MD5</replaceable></term>
+ <term><option>-\-fileid</option> <replaceable>MD5</replaceable></term>
<listitem><para>
Query package that contains a given file identifier, i.e. the
<replaceable>MD5</replaceable> digest of the file contents.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-g, --group</option> <replaceable>GROUP</replaceable></term>
+ <term><option>-g, -\-group</option> <replaceable>GROUP</replaceable></term>
<listitem><para>
Query packages with the group of <replaceable>GROUP</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--hdrid</option> <replaceable>SHA1</replaceable></term>
+ <term><option>-\-hdrid</option> <replaceable>SHA1</replaceable></term>
<listitem><para>
Query package that contains a given header identifier, i.e. the
<replaceable>SHA1</replaceable> digest of the immutable header region.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-p, --package</option> <replaceable>PACKAGE_FILE</replaceable></term>
+ <term><option>-p, -\-package</option> <replaceable>PACKAGE_FILE</replaceable></term>
<listitem><para>
Query an (uninstalled) package <replaceable>PACKAGE_FILE</replaceable>.
The <replaceable>PACKAGE_FILE</replaceable> may be specified
@@ -925,20 +925,20 @@
arguments to the query.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--pkgid</option> <replaceable>MD5</replaceable></term>
+ <term><option>-\-pkgid</option> <replaceable>MD5</replaceable></term>
<listitem><para>
Query package that contains a given package identifier, i.e. the
<replaceable>MD5</replaceable> digest of the combined header and
payload contents.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--querybynumber</option> <replaceable>HDRNUM</replaceable></term>
+ <term><option>-\-querybynumber</option> <replaceable>HDRNUM</replaceable></term>
<listitem><para>
Query the <replaceable>HDRNUM</replaceable>th database entry
directly; this is useful only for debugging.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--specfile</option> <replaceable>SPECFILE</replaceable></term>
+ <term><option>-\-specfile</option> <replaceable>SPECFILE</replaceable></term>
<listitem><para>
Parse and query <replaceable>SPECFILE</replaceable> as if
it were a package. Although not all the information (e.g. file lists)
@@ -947,7 +947,7 @@
parser.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--tid</option> <replaceable>TID</replaceable></term>
+ <term><option>-\-tid</option> <replaceable>TID</replaceable></term>
<listitem><para>
Query package(s) that have a given <replaceable>TID</replaceable>
transaction identifier. A unix time stamp is currently used as a
@@ -955,18 +955,18 @@
a single transaction have a common identifier.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--triggeredby</option> <replaceable>PACKAGE_NAME</replaceable></term>
+ <term><option>-\-triggeredby</option> <replaceable>PACKAGE_NAME</replaceable></term>
<listitem><para>
Query packages that are triggered by package(s)
<replaceable>PACKAGE_NAME</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--whatprovides</option> <replaceable>CAPABILITY</replaceable></term>
+ <term><option>-\-whatprovides</option> <replaceable>CAPABILITY</replaceable></term>
<listitem><para>
Query all packages that provide the <replaceable>CAPABILITY</replaceable> capability.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--whatrequires</option> <replaceable>CAPABILITY</replaceable></term>
+ <term><option>-\-whatrequires</option> <replaceable>CAPABILITY</replaceable></term>
<listitem><para>
Query all packages that require <replaceable>CAPABILITY</replaceable> for proper functioning.
</para></listitem>
@@ -979,22 +979,22 @@
<para>
<variablelist>
<varlistentry>
- <term><option>--changelog</option></term>
+ <term><option>-\-changelog</option></term>
<listitem><para>
Display change information for the package.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-c, --configfiles</option></term>
+ <term><option>-c, -\-configfiles</option></term>
<listitem><para>
List only configuration files (implies <option>-l</option>).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-d, --docfiles</option></term>
+ <term><option>-d, -\-docfiles</option></term>
<listitem><para>
List only documentation files (implies <option>-l</option>).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--dump</option></term>
+ <term><option>-\-dump</option></term>
<listitem><para>
Dump file information as follows:
</para>
@@ -1008,45 +1008,45 @@
<option>-d</option>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--filesbypkg</option></term>
+ <term><option>-\-filesbypkg</option></term>
<listitem><para>
List all the files in each selected package.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-i, --info</option></term>
+ <term><option>-i, -\-info</option></term>
<listitem><para>
Display package information, including name, version, and description.
- This uses the <option>--queryformat</option> if one was specified.
+ This uses the <option>-\-queryformat</option> if one was specified.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--last</option></term>
+ <term><option>-\-last</option></term>
<listitem><para>
Orders the package listing by install time such that the latest
packages are at the top.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-l, --list</option></term>
+ <term><option>-l, -\-list</option></term>
<listitem><para>
List files in package.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--provides</option></term>
+ <term><option>-\-provides</option></term>
<listitem><para>
List capabilities this package provides.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-R, --requires</option></term>
+ <term><option>-R, -\-requires</option></term>
<listitem><para>
List capabilities on which this package depends.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--scripts</option></term>
+ <term><option>-\-scripts</option></term>
<listitem><para>
List the package specific scriptlet(s) that are used as part
of the installation and uninstallation processes.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>-s, --state</option></term>
+ <term><option>-s, -\-state</option></term>
<listitem><para>
Display the <replaceable>states</replaceable> of files in the package
(implies <option>-l</option>). The state of each file is one of
@@ -1055,7 +1055,7 @@
<replaceable>replaced</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--triggers, --triggerscripts</option></term>
+ <term><option>-\-triggers, -\-triggerscripts</option></term>
<listitem><para>
Display the trigger scripts, if any, which are contained in
the package.
@@ -1073,7 +1073,7 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>-V|--verify</option></arg>
+ <arg choice="req"><option>-V|-\-verify</option></arg>
<arg><synopfragmentref linkend="select-options">
select-options
</synopfragmentref></arg>
@@ -1091,7 +1091,7 @@
each file. Any discrepancies are displayed.
Files that were not installed from the package, for example,
documentation files excluded on installation using the
- "<option>--excludedocs</option>" option,
+ "<option>-\-excludedocs</option>" option,
will be silently ignored.
</para>
@@ -1101,39 +1101,39 @@
Other options unique to verify mode are:
<variablelist>
<varlistentry>
- <term><option>--nodeps</option></term>
+ <term><option>-\-nodeps</option></term>
<listitem><para>
Don't verify dependencies of packages.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nodigest</option></term>
+ <term><option>-\-nodigest</option></term>
<listitem><para>
Don't verify package or header digests when reading.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nofiles</option></term>
+ <term><option>-\-nofiles</option></term>
<listitem><para>
Don't verify any attributes of package files.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--noscripts</option></term>
+ <term><option>-\-noscripts</option></term>
<listitem><para>
Don't execute the <command>%verifyscript</command> scriptlet (if any).
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nosignature</option></term>
+ <term><option>-\-nosignature</option></term>
<listitem><para>
Don't verify package or header signatures when reading.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nolinkto</option></term>
- <term><option>--nomd5</option></term>
- <term><option>--nosize</option></term>
- <term><option>--nouser</option></term>
- <term><option>--nogroup</option></term>
- <term><option>--nomtime</option></term>
- <term><option>--nomode</option></term>
- <term><option>--nordev</option></term>
+ <term><option>-\-nolinkto</option></term>
+ <term><option>-\-nomd5</option></term>
+ <term><option>-\-nosize</option></term>
+ <term><option>-\-nouser</option></term>
+ <term><option>-\-nogroup</option></term>
+ <term><option>-\-nomtime</option></term>
+ <term><option>-\-nomode</option></term>
+ <term><option>-\-nordev</option></term>
<listitem><para>
Don't verify the corresponding file attribute.
</para></listitem>
@@ -1175,7 +1175,7 @@
indicates the test could not be performed (e.g. file permissions
prevent reading). Otherwise, the (mnemonically
em<command>B</command>oldened) character denotes failure of
- the corresponding <option>--verify</option> test:
+ the corresponding <option>-\-verify</option> test:
<simplelist>
<member>
@@ -1215,31 +1215,31 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>--import</option></arg>
+ <arg choice="req"><option>-\-import</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PUBKEY</replaceable></arg>
</cmdsynopsis><cmdsynopsis>
&rpm;
- <arg choice="plain"><option>--checksig</option></arg>
- <arg><option>--nogpg</option></arg>
- <arg><option>--nopgp</option></arg>
- <arg><option>--nomd5</option></arg>
+ <arg choice="plain"><option>-\-checksig</option></arg>
+ <arg><option>-\-nogpg</option></arg>
+ <arg><option>-\-nopgp</option></arg>
+ <arg><option>-\-nomd5</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PACKAGE_FILE</replaceable></arg>
</cmdsynopsis>
</para>
<para>
- The <option>--checksig</option> option checks all the digests and
+ The <option>-\-checksig</option> option checks all the digests and
signatures contained in <replaceable>PACKAGE_FILE</replaceable>
to ensure the integrity and origin of the package. Note that
signatures are now verified whenever a package is read, and
- <option>--checksig</option> is useful to verify
+ <option>-\-checksig</option> is useful to verify
all of the digests and signatures associated with a package.
</para>
<para>
Digital signatures cannot be verified without a public key.
An ASCII armored public key can be added to the &rpm; database
- using <option>--import</option>. An imported public key is
+ using <option>-\-import</option>. An imported public key is
carried in a header, and key ring management is performed
exactly like package management. For example, all currently imported
public keys can be displayed by:
@@ -1268,12 +1268,12 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>--addsign|--resign</option></arg>
+ <arg choice="req"><option>-\-addsign|-\-resign</option></arg>
<arg rep="repeat" choice="plain"><replaceable>PACKAGE_FILE</replaceable></arg>
</cmdsynopsis>
</para>
<para>
- Both of the <option>--addsign</option> and <option>--resign</option>
+ Both of the <option>-\-addsign</option> and <option>-\-resign</option>
options generate and insert new signatures for each package
<replaceable>PACKAGE_FILE</replaceable> given, replacing any
existing signatures. There are two options for historical reasons,
@@ -1346,16 +1346,16 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="req"><option>--initdb|--rebuilddb</option></arg>
+ <arg choice="req"><option>-\-initdb|-\-rebuilddb</option></arg>
<arg><option>-v</option></arg>
- <arg><option>--dbpath</option> <replaceable>DIRECTORY</replaceable></arg>
- <arg><option>--root</option> <replaceable>DIRECTORY</replaceable></arg>
+ <arg><option>-\-dbpath</option> <replaceable>DIRECTORY</replaceable></arg>
+ <arg><option>-\-root</option> <replaceable>DIRECTORY</replaceable></arg>
</cmdsynopsis>
</para>
<para>
- Use <option>--initdb</option> to create a new database, use
- <option>--rebuilddb</option> to rebuild the database indices from
+ Use <option>-\-initdb</option> to create a new database, use
+ <option>-\-rebuilddb</option> to rebuild the database indices from
the installed package headers.
</para>
</refsect2>
@@ -1368,7 +1368,7 @@
<para>
<cmdsynopsis>
&rpm;
- <arg choice="plain"><option>--showrc</option></arg>
+ <arg choice="plain"><option>-\-showrc</option></arg>
</cmdsynopsis>
</para>
@@ -1408,7 +1408,7 @@
ftp URLs:
<variablelist>
<varlistentry>
- <term><option>--ftpproxy</option> <replaceable>HOST</replaceable></term>
+ <term><option>-\-ftpproxy</option> <replaceable>HOST</replaceable></term>
<listitem><para>
The host <replaceable>HOST</replaceable> will be used as a proxy server
for all ftp transfers, which allows users to ftp through firewall
@@ -1416,7 +1416,7 @@
by configuring the macro <command>%_ftpproxy</command>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--ftpport</option> <replaceable>PORT</replaceable></term>
+ <term><option>-\-ftpport</option> <replaceable>PORT</replaceable></term>
<listitem><para>
The TCP <replaceable>PORT</replaceable> number to use for
the ftp connection on the proxy ftp server instead of the default
@@ -1432,7 +1432,7 @@
<command>http</command> URLs:
<variablelist>
<varlistentry>
- <term><option>--httpproxy</option> <replaceable>HOST</replaceable></term>
+ <term><option>-\-httpproxy</option> <replaceable>HOST</replaceable></term>
<listitem><para>
The host <replaceable>HOST</replaceable> will be used as
a proxy server for all <command>http</command> transfers. This
@@ -1440,7 +1440,7 @@
<command>%_httpproxy</command>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--httpport</option> <replaceable>PORT</replaceable></term>
+ <term><option>-\-httpport</option> <replaceable>PORT</replaceable></term>
<listitem><para>
The TCP <replaceable>PORT</replaceable> number to use for the
<command>http</command> connection on the proxy http server instead
@@ -1472,27 +1472,27 @@
the <command>rpm</command> command line:
</para><para>
<computeroutput>
-rpm exec --bp rpmb -bp
-rpm exec --bc rpmb -bc
-rpm exec --bi rpmb -bi
-rpm exec --bl rpmb -bl
-rpm exec --ba rpmb -ba
-rpm exec --bb rpmb -bb
-rpm exec --bs rpmb -bs
-rpm exec --tp rpmb -tp
-rpm exec --tc rpmb -tc
-rpm exec --ti rpmb -ti
-rpm exec --tl rpmb -tl
-rpm exec --ta rpmb -ta
-rpm exec --tb rpmb -tb
-rpm exec --ts rpmb -ts
-rpm exec --rebuild rpmb --rebuild
-rpm exec --recompile rpmb --recompile
-rpm exec --clean rpmb --clean
-rpm exec --rmsource rpmb --rmsource
-rpm exec --rmspec rpmb --rmspec
-rpm exec --target rpmb --target
-rpm exec --short-circuit rpmb --short-circuit
+rpm exec -\-bp rpmb \-bp
+rpm exec -\-bc rpmb \-bc
+rpm exec -\-bi rpmb \-bi
+rpm exec -\-bl rpmb \-bl
+rpm exec -\-ba rpmb \-ba
+rpm exec -\-bb rpmb \-bb
+rpm exec -\-bs rpmb \-bs
+rpm exec -\-tp rpmb \-tp
+rpm exec -\-tc rpmb \-tc
+rpm exec -\-ti rpmb \-ti
+rpm exec -\-tl rpmb \-tl
+rpm exec -\-ta rpmb \-ta
+rpm exec -\-tb rpmb \-tb
+rpm exec -\-ts rpmb \-ts
+rpm exec -\-rebuild rpmb -\-rebuild
+rpm exec -\-recompile rpmb -\-recompile
+rpm exec -\-clean rpmb -\-clean
+rpm exec -\-rmsource rpmb -\-rmsource
+rpm exec -\-rmspec rpmb -\-rmspec
+rpm exec -\-target rpmb -\-target
+rpm exec -\-short-circuit rpmb -\-short-circuit
</computeroutput>
</para>
</refsect2>
@@ .
patch -p0 <<'@@ .'
Index: max-rpm/rpmbuild-manpage.sgml
============================================================================
$ cvs diff -u -r1.9 -r1.10 rpmbuild-manpage.sgml
--- max-rpm/rpmbuild-manpage.sgml 16 Jun 2005 21:38:42 -0000 1.9
+++ max-rpm/rpmbuild-manpage.sgml 21 Sep 2010 16:46:09 -0000 1.10
@@ -36,7 +36,7 @@
</member><member>
<cmdsynopsis>
&rpmb;
- <arg choice="req"><option>--rebuild|--recompile</option></arg>
+ <arg choice="req"><option>-\-rebuild|-\-recompile</option></arg>
<arg rep="repeat" choice="plain"><replaceable>SOURCEPKG</replaceable></arg>
</cmdsynopsis>
</member>
@@ -49,7 +49,7 @@
<member>
<cmdsynopsis>
&rpmb;
- <arg choice="req"><option>--showrc</option></arg>
+ <arg choice="req"><option>-\-showrc</option></arg>
</cmdsynopsis>
</member>
</simplelist>
@@ -62,21 +62,21 @@
<cmdsynopsis>
<command></command>
-<!-- ================================ -->
+<!-\- ================================ -\->
<synopfragment id="rpmbuild-options">
<group choice="plain">
- <arg><option>--buildroot</option> <replaceable>DIRECTORY</replaceable></arg>
- <arg><option>--clean</option></arg>
- <arg><option>--nobuild</option></arg>
- <arg><option>--rmsource</option></arg>
- <arg><option>--rmspec</option></arg>
+ <arg><option>-\-buildroot</option> <replaceable>DIRECTORY</replaceable></arg>
+ <arg><option>-\-clean</option></arg>
+ <arg><option>-\-nobuild</option></arg>
+ <arg><option>-\-rmsource</option></arg>
+ <arg><option>-\-rmspec</option></arg>
<sbr/>
- <arg><option>--short-circuit</option></arg>
- <arg><option>--sign</option></arg>
- <arg><option>--target</option> <replaceable>PLATFORM</replaceable></arg>
+ <arg><option>-\-short-circuit</option></arg>
+ <arg><option>-\-sign</option></arg>
+ <arg><option>-\-target</option> <replaceable>PLATFORM</replaceable></arg>
</group>
</synopfragment>
-<!-- ================================ -->
+<!-\- ================================ -\->
</cmdsynopsis>
</member>
@@ -112,17 +112,17 @@
</para>
<variablelist>
<varlistentry>
- <term><option>-?, --help</option></term>
+ <term><option>-?, -\-help</option></term>
<listitem><para>
Print a longer usage message then normal.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--version</option></term>
+ <term><option>-\-version</option></term>
<listitem><para>
Print a single line containing the version number of &rpm;
being used. </para></listitem>
</varlistentry><varlistentry>
- <term><option>--quiet</option></term>
+ <term><option>-\-quiet</option></term>
<listitem><para>
Print as little as possible - normally only error messages will
be displayed.
@@ -139,7 +139,7 @@
Print lots of ugly debugging information.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--rcfile</option> <replaceable>FILELIST</replaceable></term>
+ <term><option>-\-rcfile</option> <replaceable>FILELIST</replaceable></term>
<listitem><para>
Each of the files in the colon separated
<replaceable>FILELIST</replaceable>
@@ -151,18 +151,18 @@
<filename>/usr/lib/rpm/rpmrc</filename>:<filename>/usr/lib/rpm/redhat/rpmrc</filename>:<filename>/etc/rpmrc</filename>:<filename>~/.rpmrc</filename>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--pipe</option> <replaceable>CMD</replaceable></term>
+ <term><option>-\-pipe</option> <replaceable>CMD</replaceable></term>
<listitem><para>
Pipes the output of &rpm; to the command <replaceable>CMD</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--dbpath</option> <replaceable>DIRECTORY</replaceable></term>
+ <term><option>-\-dbpath</option> <replaceable>DIRECTORY</replaceable></term>
<listitem><para>
Use the database in <replaceable>DIRECTORY</replaceable> rather
than the default path <filename>/var/lib/rpm</filename>
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--root</option> <replaceable>DIRECTORY</replaceable></term>
+ <term><option>-\-root</option> <replaceable>DIRECTORY</replaceable></term>
<listitem><para>
Use the file system tree rooted at <replaceable>DIRECTORY</replaceable> for all operations.
Note that this means the database within
@@ -252,42 +252,42 @@
</para>
<variablelist>
<varlistentry>
- <term><option>--buildroot</option> <replaceable>DIRECTORY</replaceable></term>
+ <term><option>-\-buildroot</option> <replaceable>DIRECTORY</replaceable></term>
<listitem><para>
When building a package, override the BuildRoot tag with directory
<replaceable>DIRECTORY</replaceable>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--clean</option></term>
+ <term><option>-\-clean</option></term>
<listitem><para>
Remove the build tree after the packages are made.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--nobuild</option></term>
+ <term><option>-\-nobuild</option></term>
<listitem><para>
Do not execute any build stages. Useful for testing out spec files.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--rmsource</option></term>
+ <term><option>-\-rmsource</option></term>
<listitem><para>
Remove the sources after the build (may also be
- used standalone, e.g. "&rpmb; <option>--rmsource foo.spec</option>").
+ used standalone, e.g. "&rpmb; <option>-\-rmsource foo.spec</option>").
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--rmspec</option></term>
+ <term><option>-\-rmspec</option></term>
<listitem><para>
Remove the spec file after the build (may also be
- used standalone, eg. "&rpmb; <option>--rmspec foo.spec</option>").
+ used standalone, eg. "&rpmb; <option>-\-rmspec foo.spec</option>").
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--short-circuit</option></term>
+ <term><option>-\-short-circuit</option></term>
<listitem><para>
Skip straight to specified stage (i.e., skip all stages leading
up to the specified stage). Only valid with <option>-bc</option>
and <option>-bi</option>.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--sign</option></term>
+ <term><option>-\-sign</option></term>
<listitem><para>
Embed a GPG signature in the package. This signature can be used
to verify the integrity and the origin of the package. See the
@@ -296,7 +296,7 @@
for configuration details.
</para></listitem>
</varlistentry><varlistentry>
- <term><option>--target</option> <replaceable>PLATFORM</replaceable></term>
+ <term><option>-\-target</option> <replaceable>PLATFORM</replaceable></term>
<listitem><para>
When building the package, interpret <replaceable>PLATFORM</replaceable>
as <option>arch-vendor-os</option> and set the macros
@@ -316,16 +316,16 @@
<para>
<cmdsynopsis>
&rpmb;
- <arg choice="req"><option>--rebuild|--recompile</option></arg>
+ <arg choice="req"><option>-\-rebuild|-\-recompile</option></arg>
<arg rep="repeat" choice="plain"><replaceable>SOURCEPKG</replaceable></arg>
</cmdsynopsis>
</para>
<para>
When invoked this way, &rpmb; installs the named source
package, and does a prep, compile and install. In addition,
- <option>--rebuild</option> builds a new binary package. When the build
+ <option>-\-rebuild</option> builds a new binary package. When the build
has completed, the build directory is removed (as in
- <option>--clean</option>) and the the sources and spec file for
+ <option>-\-clean</option>) and the the sources and spec file for
the package are removed.
</para>
</refsect2>
@@ -338,7 +338,7 @@
<para>
<cmdsynopsis>
&rpmb;
- <arg choice="plain"><option>--showrc</option></arg>
+ <arg choice="plain"><option>-\-showrc</option></arg>
</cmdsynopsis>
</para>
@@ .
patch -p0 <<'@@ .'
Index: max-rpm/rpmdeps-manpage.sgml
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmdeps-manpage.sgml
--- max-rpm/rpmdeps-manpage.sgml 16 Jun 2005 21:38:42 -0000 1.3
+++ max-rpm/rpmdeps-manpage.sgml 21 Sep 2010 16:46:09 -0000 1.4
@@ -16,8 +16,8 @@
<member>
<cmdsynopsis>
<command>rpmdeps</command>
- <arg choice="req"><option>{-P|--provides}</option></arg>
- <arg choice="req"><option>{-R|--requires}</option></arg>
+ <arg choice="req"><option>{-P|-\-provides}</option></arg>
+ <arg choice="req"><option>{-R|-\-requires}</option></arg>
<arg rep="repeat" choice="plain"><replaceable>FILE</replaceable></arg>
</cmdsynopsis>
</member>
@@ .
Received on Tue Sep 21 18:46:10 2010