diff --git a/perl-5.8.0-links.patch b/perl-5.8.0-links.patch new file mode 100644 index 0000000..9f8adf6 --- /dev/null +++ b/perl-5.8.0-links.patch @@ -0,0 +1,40 @@ +--- perl-5.8.0/lib/CPAN/FirstTime.pm.links 2002-08-15 14:58:47.000000000 -0400 ++++ perl-5.8.0/lib/CPAN/FirstTime.pm 2002-08-15 14:59:07.000000000 -0400 +@@ -258,7 +258,7 @@ + my(@path) = split /$Config{'path_sep'}/, $ENV{'PATH'}; + local $^W = $old_warn; + my $progname; +- for $progname (qw/gzip tar unzip make lynx wget ncftpget ncftp ftp/){ ++ for $progname (qw/gzip tar unzip make links wget ncftpget ncftp ftp/){ + if ($^O eq 'MacOS') { + $CPAN::Config->{$progname} = 'not_here'; + next; +--- perl-5.8.0/lib/CPAN.pm.links 2002-08-15 14:58:37.000000000 -0400 ++++ perl-5.8.0/lib/CPAN.pm 2002-08-15 15:00:08.000000000 -0400 +@@ -2528,7 +2528,7 @@ + + $self->debug("localizing funkyftpwise[$url]") if $CPAN::DEBUG; + my($f,$funkyftp); +- for $f ('lynx','ncftpget','ncftp','wget') { ++ for $f ('links','ncftpget','ncftp','wget') { + next unless exists $CPAN::Config->{$f}; + $funkyftp = $CPAN::Config->{$f}; + next unless defined $funkyftp; +@@ -2537,7 +2537,7 @@ + ($asl_ungz = $aslocal) =~ s/\.gz//; + $asl_gz = "$asl_ungz.gz"; + my($src_switch) = ""; +- if ($f eq "lynx"){ ++ if ($f eq "links"){ + $src_switch = " -source"; + } elsif ($f eq "ncftp"){ + $src_switch = " -c"; +@@ -2561,7 +2561,7 @@ + my($wstatus); + if (($wstatus = system($system)) == 0 + && +- ($f eq "lynx" ? ++ ($f eq "links" ? + -s $asl_ungz # lynx returns 0 when it fails somewhere + : 1 + ) diff --git a/perl.spec b/perl.spec index 2947fde..e549ed6 100644 --- a/perl.spec +++ b/perl.spec @@ -3,7 +3,7 @@ %define suidperl 1 %define perlver 5.8.0 -%define perlrel 49 +%define perlrel 50 %define perlepoch 2 %define cpanver 1.61 %define dbfilever 1.804 @@ -87,6 +87,9 @@ Patch17: perl-5.8.0-sharedlinker.patch # perl 5.8.0 likes to use man3ext for BOTH directories AND files. not kosher. Patch18: perl-5.8.0-manext.patch +# lynx is depracated, use links instead +Patch19: perl-5.8.0-links.patch + Buildroot: %{_tmppath}/%{name}-root BuildRequires: gawk, grep, tcsh @@ -230,6 +233,7 @@ more secure running of setuid perl scripts. %patch17 -p1 -b .sharedlinker %patch18 -p1 -b .manext +%patch19 -p1 -b .links find . -name \*.orig -exec rm -fv {} \; @@ -378,6 +382,9 @@ find $RPM_BUILD_ROOT%{_libdir}/perl* -name .packlist -o -name perllocal.pod | \ %endif %changelog +* Thu Aug 15 2002 Chip Turner +- change from lynx to links in CPAN.pm + * Tue Aug 6 2002 Chip Turner - automated release bump and build - remove Filter packages and use CPAN ones