X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-bb-and-short-circuit.patch;h=8a67f9b3b62d3d9aefe0094b2047f4c700e84cd8;hb=d68708d13fa5e28142a4edf58a8fd491cb85b72d;hp=7a4039106f6f8b18ccb41bb9e9e6200f982e59d2;hpb=df9b3d1dfa4a81a236a39d81f1c9e39afce40dd4;p=packages%2Frpm.git

diff --git a/rpm-bb-and-short-circuit.patch b/rpm-bb-and-short-circuit.patch
index 7a40391..8a67f9b 100644
--- a/rpm-bb-and-short-circuit.patch
+++ b/rpm-bb-and-short-circuit.patch
@@ -9,3 +9,31 @@
  	    /*@fallthrough@*/
  	case 'i':
  	    ba->buildAmount |= RPMBUILD_INSTALL;
+diff -Nura rpm-4.3/doc/pl/rpmbuild.8 rpm-4.3.aft/doc/pl/rpmbuild.8
+--- rpm-4.3/doc/pl/rpmbuild.8	2004-05-20 14:13:22.000000000 +0200
++++ rpm-4.3.aft/doc/pl/rpmbuild.8	2004-05-20 14:10:43.000000000 +0200
+@@ -145,7 +145,8 @@
+ .TP
+ \fB--short-circuit\fR
+ Przechodzi wprost do podanego etapu (tzn. pomija wszystkie etapy
+-prowadz±ce do podanego). Prawid³owe tylko z \fB-bc\fR i \fB-bi\fR.
++prowadz±ce do podanego). Prawid³owe tylko z \fB-bc\fR, \fB-bi\fR
++i \fB-bb\fR (-bb --short-circuit odnosi siê do PLD i jest niezalecane).
+ .TP
+ \fB--sign\fR
+ Osadza w pakiecie sygnaturê GPG. Sygnatura ta mo¿e byæ u¿ywana do
+diff -Nura rpm-4.3/doc/rpmbuild.8 rpm-4.3.aft/doc/rpmbuild.8
+--- rpm-4.3/doc/rpmbuild.8	2004-05-20 14:13:22.000000000 +0200
++++ rpm-4.3.aft/doc/rpmbuild.8	2004-05-20 14:10:13.000000000 +0200
+@@ -167,8 +167,9 @@
+ .TP
+ \fB--short-circuit\fR
+ Skip straight to specified stage (i.e., skip all stages leading
+-up to the specified stage).  Only valid with \fB-bc\fR
+-and \fB-bi\fR.
++up to the specified stage).  Only valid with \fB-bc\fR, \fB-bi\fR
++and \fB-bb\fR (note: -bb in conjunction with --short-circuit is
++PLD-specific and not recommended).
+ .TP
+ \fB--sign\fR
+ Embed a GPG signature in the package. This signature can be used