rpms/perl/devel perl-5.8.8-perlbug-tag.patch,1.1.2.1,1.1.2.2

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24781

Modified Files:
      Tag: perl-5_8_8-0_RC1
	perl-5.8.8-perlbug-tag.patch 
Log Message:
rebase perl-5.8.3-perlbug-tag.patch to 5.8.8

perl-5.8.8-perlbug-tag.patch:
 perlbug.PL |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

Index: perl-5.8.8-perlbug-tag.patch
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/Attic/perl-5.8.8-perlbug-tag.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- perl-5.8.8-perlbug-tag.patch	20 Jan 2006 22:16:43 -0000	1.1.2.1
+++ perl-5.8.8-perlbug-tag.patch	31 Jan 2006 19:54:04 -0000	1.1.2.2
@@ -1,19 +1,28 @@
 --- perl-5.8.8-RC1/utils/perlbug.PL.perlbug	2006-01-03 14:07:41.000000000 -0500
-+++ perl-5.8.8-RC1/utils/perlbug.PL	2006-01-20 14:33:26.000000000 -0500
-@@ -71,7 +71,7 @@
++++ perl-5.8.8-RC1/utils/perlbug.PL	2006-01-31 14:33:47.000000000 -0500
+@@ -27,7 +27,6 @@
+ open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h")
+     or die "Can't open patchlevel.h: $!";
+ 
+-my $patchlevel_date = (stat PATCH_LEVEL)[9];
+ my $patchnum = "";
+ 
+ while (<PATCH_LEVEL>) {
+@@ -71,9 +70,8 @@
      eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
  	if \$running_under_some_shell;
  
 -my \$config_tag1 = '$extract_version - $Config{cf_time}';
 +my \$config_tag1 = '$extract_version';
  
- my \$patchlevel_date = $patchlevel_date;
+-my \$patchlevel_date = $patchlevel_date;
  my \$patch_tags = '$patch_tags';
-@@ -287,18 +287,9 @@
-     # OK - send "OK" report for build on this system
+ my \@patches = (
+     $patch_desc
+@@ -288,17 +286,6 @@
      $ok = 0;
      if ($::opt_o) {
--	if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
+ 	if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
 -	    my $age = time - $patchlevel_date;
 -	    if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
 -		my $date = localtime $patchlevel_date;
@@ -25,18 +34,17 @@
 -EOF
 -		exit();
 -	    }
-+	#
-+	# Red Hat modification: remove -ok / -nok refusal to report due to age
-+	#
  	    # force these options
  	    unless ($::opt_n) {
  		$::opt_S = 1; # don't prompt for send
-@@ -605,7 +596,7 @@
+@@ -605,8 +592,8 @@
      print OUT <<EFF;
  ---
  EFF
 -    print OUT "This perlbug was built using Perl $config_tag1\n",
+-	    "It is being executed now by  Perl $config_tag2.\n\n"
 +    print OUT "This perlbug was built using Perl $config_tag1 in the Red Hat build system.\n",
- 	    "It is being executed now by  Perl $config_tag2.\n\n"
++	    "It is being executed now by Perl $config_tag2.\n\n"
  	if $config_tag2 ne $config_tag1;
  
+     print OUT <<EOF;