RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 01-Aug-2013 13:05:12
Branch: rpm-5_4 Handle: 2013080111051101
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/doc rpm.8
Log:
merge @rpm.org commit 4ea9e8d8c6d2f3efd75797
Make rpm man page more clear
Put --querytags and --showrc and --setperms and --setugids in
separate lines to indicate that they all mutually exclusive.
Move --querytags in the QUERYING AND VERIFYING PACKAGES section
Summary:
Revision Changes Path
1.3501.2.332+6 -1 rpm/CHANGES
1.38.2.2 +6 -2 rpm/doc/rpm.8
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.331 -r1.3501.2.332 CHANGES
--- rpm/CHANGES 29 Jul 2013 05:14:54 -0000 1.3501.2.331
+++ rpm/CHANGES 1 Aug 2013 11:05:11 -0000 1.3501.2.332
@@ -1,4 +1,9 @@
-5.4.12 -> 5.4.13:
+5.4.12 -> 5.4.13:
+ - devzero2000: merge @rpm.org commit 4ea9e8d8c6d2f3efd75797
+ Make rpm man page more clear
+ Put --querytags and --showrc and --setperms and --setugids in
+ separate lines to indicate that they all mutually exclusive.
+ Move --querytags in the QUERYING AND VERIFYING PACKAGES section
- jbj: gcrypt: resurrect ELG/ECDSA CI checks.
- jbj: i18n: update PO files (Translation Project).
- jbj: start rpm-5.4.13 development.
@@ .
patch -p0 <<'@@ .'
Index: rpm/doc/rpm.8
============================================================================
$ cvs diff -u -r1.38.2.1 -r1.38.2.2 rpm.8
--- rpm/doc/rpm.8 11 May 2011 09:24:04 -0000 1.38.2.1
+++ rpm/doc/rpm.8 1 Aug 2013 11:05:12 -0000 1.38.2.2
@@ -12,6 +12,8 @@
\fBrpm\fR {\fB-q|-\-query\fR} [\fBselect-options\fR] [\fBquery-options\fR]
+\fBrpm\fR {\fB-\-querytags\fR}
+
\fBrpm\fR {\fB-V|-\-verify\fR} [\fBselect-options\fR] [\fBverify-options\fR]
\fBrpm\fR \fB-\-import\fR \fB\fIPUBKEY\fB\fR\fI ...\fR
@@ -38,9 +40,11 @@
\fBrpm\fR {\fB-\-addsign|-\-resign\fR} \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
-\fBrpm\fR {\fB-\-querytags|-\-showrc\fR}
+\fBrpm\fR {\fB-\-showrc\fR}
+
+\fBrpm\fR {\fB-\-setperms} \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
-\fBrpm\fR {\fB-\-setperms|-\-setugids\fR} \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+\fBrpm\fR {\fB-\-setugids\fR} \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
.SS "select-options"
.PP
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
