- Add query options for weak dependencies to the man page
- Resolves: #1235230
This commit is contained in:
parent
3b6a3d6051
commit
76d3f4014f
|
@ -0,0 +1,63 @@
|
|||
From c336b1474402a566d5351ff41c45559d02a3389a Mon Sep 17 00:00:00 2001
|
||||
From: Florian Festi <ffesti@redhat.com>
|
||||
Date: Wed, 24 Jun 2015 15:48:23 +0200
|
||||
Subject: [PATCH] Add --enhances, --recommends, --suggests and --supplements to
|
||||
the man page
|
||||
|
||||
---
|
||||
doc/rpm.8 | 22 ++++++++++++++++++----
|
||||
1 file changed, 18 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/doc/rpm.8 b/doc/rpm.8
|
||||
index c91ce3b..136a595 100644
|
||||
--- a/doc/rpm.8
|
||||
+++ b/doc/rpm.8
|
||||
@@ -66,10 +66,12 @@ rpm \- RPM Package Manager
|
||||
|
||||
|
||||
[\fB--changelog\fR] [\fB-c,--configfiles\fR] [\fB--conflicts\fR]
|
||||
- [\fB-d,--docfiles\fR] [\fB--dump\fR] [\fB--filesbypkg\fR] [\fB-i,--info\fR]
|
||||
- [\fB--last\fR] [\fB-l,--list\fR] [\fB--obsoletes\fR] [\fB--provides\fR]
|
||||
- [\fB--qf,--queryformat \fIQUERYFMT\fB\fR] [\fB-R,--requires\fR]
|
||||
- [\fB--scripts\fR] [\fB-s,--state\fR] [\fB--triggers,--triggerscripts\fR]
|
||||
+ [\fB-d,--docfiles\fR] [\fB--dump\fR] [\fB--enhances\fR] [\fB--filesbypkg\fR]
|
||||
+ [\fB-i,--info\fR] [\fB--last\fR] [\fB-l,--list\fR] [\fB--obsoletes\fR]
|
||||
+ [\fB--provides\fR] [\fB--qf,--queryformat \fIQUERYFMT\fB\fR]
|
||||
+ [\fB--recommends\fR] [\fB-R,--requires\fR] [\fB--suggests\fR]
|
||||
+ [\fB--supplements\fR] [\fB--scripts\fR] [\fB-s,--state\fR]
|
||||
+ [\fB--triggers,--triggerscripts\fR]
|
||||
|
||||
.SS "verify-options"
|
||||
.PP
|
||||
@@ -628,6 +630,9 @@ path size mtime digest mode owner group isconfig isdoc rdev symlink
|
||||
.fi
|
||||
.RE
|
||||
.TP
|
||||
+\fB--enhances\fR
|
||||
+List capabilities enhanced by package(s)
|
||||
+.TP
|
||||
\fB--filesbypkg\fR
|
||||
List all the files in each selected package.
|
||||
.TP
|
||||
@@ -651,9 +656,18 @@ List packages this package obsoletes.
|
||||
\fB--provides\fR
|
||||
List capabilities this package provides.
|
||||
.TP
|
||||
+\fB--recommends\fR
|
||||
+List capabilities recommended by package(s)
|
||||
+.TP
|
||||
\fB-R, --requires\fR
|
||||
List capabilities on which this package depends.
|
||||
.TP
|
||||
+\fB--suggests\fR
|
||||
+List capabilities suggested by package(s)
|
||||
+.TP
|
||||
+\fB--supplements\fR
|
||||
+List capabilities supplemented by package(s)
|
||||
+.TP
|
||||
\fB--scripts\fR
|
||||
List the package specific scriptlet(s) that are used as part
|
||||
of the installation and uninstallation processes.
|
||||
--
|
||||
2.1.0
|
||||
|
6
rpm.spec
6
rpm.spec
|
@ -27,7 +27,7 @@
|
|||
Summary: The RPM package management system
|
||||
Name: rpm
|
||||
Version: %{rpmver}
|
||||
Release: %{?snapver:0.%{snapver}.}12%{?dist}
|
||||
Release: %{?snapver:0.%{snapver}.}13%{?dist}
|
||||
Group: System Environment/Base
|
||||
Url: http://www.rpm.org/
|
||||
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
|
||||
|
@ -65,6 +65,7 @@ Patch105: rpm-4.12.0-whatrecommends.patch
|
|||
Patch108: rpm-4.12.0-gpg-passphrase1.patch
|
||||
Patch109: rpm-4.12.0-gpg-passphrase2.patch
|
||||
Patch110: rpm-4.12.0-Fix-Python3-import.patch
|
||||
Patch111: rpm-4.12.x-weakdeps-manpage.patch
|
||||
|
||||
# These are not yet upstream
|
||||
Patch302: rpm-4.7.1-geode-i686.patch
|
||||
|
@ -549,6 +550,9 @@ exit 0
|
|||
%doc doc/librpm/html/*
|
||||
|
||||
%changelog
|
||||
* Fri Oct 30 2015 Florian Festi <ffesti@rpm.org> - 4.12.0.1-13
|
||||
- Add query options for weak dependencies to the man page (#1235230)
|
||||
|
||||
* Mon Jun 29 2015 Florian Festi <ffesti@rpm.org> - 4.12.0.1-12
|
||||
- Fix Python import directive for more strict Python3 search rules (#1236493)
|
||||
|
||||
|
|
Loading…
Reference in New Issue