Upgrade to 3.2801 as provided in perl-5.28.0-RC1

This commit is contained in:
Jitka Plesnikova 2018-05-24 10:55:36 +02:00
parent c582b2f1fb
commit 2a29c303fd
2 changed files with 60 additions and 4 deletions

View File

@ -0,0 +1,49 @@
From d469b8609b566b972c7cc3ed74029cdddea50eee Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Thu, 24 May 2018 10:48:47 +0200
Subject: [PATCH] Upgrade to 3.2801
---
lib/Pod/Perldoc.pm | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/lib/Pod/Perldoc.pm b/lib/Pod/Perldoc.pm
index 8d695b2..bb6ffc8 100644
--- a/lib/Pod/Perldoc.pm
+++ b/lib/Pod/Perldoc.pm
@@ -12,7 +12,7 @@ use File::Spec::Functions qw(catfile catdir splitdir);
use vars qw($VERSION @Pagers $Bindir $Pod2man
$Temp_Files_Created $Temp_File_Lifetime
);
-$VERSION = '3.28';
+$VERSION = '3.2801';
#..........................................................................
@@ -486,11 +486,6 @@ sub init_formatter_class_list {
$self->opt_M_with('Pod::Perldoc::ToPod'); # the always-there fallthru
$self->opt_o_with('text');
- $self->opt_o_with('term')
- unless $self->is_mswin32 || $self->is_dos || $self->is_amigaos
- || !($ENV{TERM} && (
- ($ENV{TERM} || '') !~ /dumb|emacs|none|unknown/i
- ));
return;
}
@@ -1937,11 +1932,6 @@ sub page { # apply a pager to the output file
} elsif($self->is_amigaos) {
last if system($pager, $output) == 0;
} else {
- my $formatter = $self->{'formatter_class'};
- if ( $formatter->can('pager_configuration') ) {
- $self->aside("About to call $formatter" . "->pager_configuration(\"$pager\")\n");
- $formatter->pager_configuration($pager, $self);
- }
last if system("$pager \"$output\"") == 0;
}
}
--
2.14.3

View File

@ -4,15 +4,18 @@
# Support for groff
%bcond_without perl_enables_groff
%global base_version 3.28
Name: perl-Pod-Perldoc
# let's overwrite the module from perl.srpm
Version: 3.28
Release: 396%{?dist}
Version: 3.28.01
Release: 1%{?dist}
Summary: Look up Perl documentation in Pod format
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Pod-Perldoc/
Source0: http://www.cpan.org/authors/id/M/MA/MALLEN/Pod-Perldoc-%{version}.tar.gz
Source0: http://www.cpan.org/authors/id/M/MA/MALLEN/Pod-Perldoc-%{base_version}.tar.gz
# Unbundled from perl 5.28.0-RC1
Patch0: Pod-Perldoc-3.28-Upgrade-to-3.2801.patch
BuildArch: noarch
BuildRequires: findutils
BuildRequires: make
@ -90,7 +93,8 @@ in the perl installation tree or in a perl script, and displays it via
the perl library modules.
%prep
%setup -q -n Pod-Perldoc-%{version}
%setup -q -n Pod-Perldoc-%{base_version}
%patch0 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor
@ -112,6 +116,9 @@ make test
%{_mandir}/man3/*
%changelog
* Thu May 24 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.28.01-1
- Upgrade to 3.2801 as provided in perl-5.28.0-RC1
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28-396
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild