aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-07-25 17:01:59 +0000
committerThierry Vignaud <tv@mageia.org>2012-07-25 17:01:59 +0000
commitd34391666d44a8ddc5b5c1220fe8e2d5cac7e470 (patch)
tree0fb85ebfae4792b5d2b5ceb6f67ddcac91603dac
parentf1464d5fa918583be521af14e861de34347d0f2b (diff)
downloadrpm-setup-d34391666d44a8ddc5b5c1220fe8e2d5cac7e470.tar
rpm-setup-d34391666d44a8ddc5b5c1220fe8e2d5cac7e470.tar.gz
rpm-setup-d34391666d44a8ddc5b5c1220fe8e2d5cac7e470.tar.bz2
rpm-setup-d34391666d44a8ddc5b5c1220fe8e2d5cac7e470.tar.xz
rpm-setup-d34391666d44a8ddc5b5c1220fe8e2d5cac7e470.zip
sync with upstream rpm.org:
"skip new-fangled head[34] while gerenerating deps (#118243)" (jbj, 2004-04-08)
-rw-r--r--NEWS1
-rwxr-xr-xperl.prov2
-rwxr-xr-xperl.req2
3 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d8039ce..6fd5d24 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
(Per Oyvind, mdv)
- perl.prov: sync with upstream rpm.org:
o make perl.{req,prov} warn about unreadable files
+ o skip new-fangled head[34] while gerenerating deps (#118243)
- use upstream fonconfig.prov as we had exactly the same file
Version 1.147-12 - 24 Jul 2012, by Colin
diff --git a/perl.prov b/perl.prov
index db6d5b2..830aeb0 100755
--- a/perl.prov
+++ b/perl.prov
@@ -101,7 +101,7 @@ sub process_file {
# properly belongs in the over/back section) but people do not
# read the perldoc.
- if (m/^=(head1|head2|pod|item)/) {
+ if (m/^=(head[1-4]|pod|item)/) {
$incomment = 1;
}
diff --git a/perl.req b/perl.req
index f69bbde..cf63adf 100755
--- a/perl.req
+++ b/perl.req
@@ -100,7 +100,7 @@ sub process_file {
# properly belongs in the over/back section) but people do not
# read the perldoc.
- if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {
+ if ( (m/^=(head[1-4]|pod|item)/) .. (m/^=(cut)/) ) {
next;
}